From 2b72a8b112f1493015b96e02dedfc1712076a4d0 Mon Sep 17 00:00:00 2001 From: Shawn Price Date: Thu, 9 Sep 2010 17:04:04 -0700 Subject: [PATCH 1/2] Allow use of assertMail() test assertion --- atrium_test/atrium_web_test_case.php | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/atrium_test/atrium_web_test_case.php b/atrium_test/atrium_web_test_case.php index 8c04bc3..3451f3b 100644 --- a/atrium_test/atrium_web_test_case.php +++ b/atrium_test/atrium_web_test_case.php @@ -108,7 +108,9 @@ protected function setUp() { variable_set('install_task', 'profile-finished'); variable_set('clean_url', $clean_url_original); variable_set('site_mail', 'simpletest@example.com'); - + // Use the test mail class instead of the default mail handler class. + // variable_set('mail_sending_system', array('default-system' => 'TestingMailSystem')); + variable_set('smtp_library', drupal_get_path('module', 'simpletest') . '/simpletest.mail.inc'); // Use temporary files directory with the same prefix as database. $this->originalFileDirectory = file_directory_path(); variable_set('file_directory_path', file_directory_path() . '/' . $db_prefix); From b00f55ada59f6b455aa586b3e2e90369239e8332 Mon Sep 17 00:00:00 2001 From: Shawn Price Date: Fri, 14 Jan 2011 13:01:03 -0800 Subject: [PATCH 2/2] Patch #935804 by adrien.gibrat: Adding Crayon display style to group_nid in "Latest files" view --- atrium_activity/atrium_activity.views_default.inc | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/atrium_activity/atrium_activity.views_default.inc b/atrium_activity/atrium_activity.views_default.inc index eeff912..86ee568 100644 --- a/atrium_activity/atrium_activity.views_default.inc +++ b/atrium_activity/atrium_activity.views_default.inc @@ -287,6 +287,10 @@ function atrium_activity_views_default_views() { 'empty_zero' => 0, 'type' => 'separator', 'separator' => ', ', + 'crayon' => array( + 'enabled' => 'enabled', + 'acronym' => 'acronym', + ), 'exclude' => 0, 'id' => 'group_nid', 'table' => 'og_ancestry',