Download as
Browse Code »

Commit 63ed4135cb84292b57506b7670dfec900d651449

Authored by Victor Costa
2 parents 7c6f7342 b9800000
Exists in staging and in 4 other branches captcha_serpro_plugin, login-captcha, production, production-vendorized

Merge branch 'master' into stable

Showing 2 changed files with 4 additions and 4 deletions   Show diff stats
debian/noosfero.links
  Diff comments   View file @63ed413
@@ -15,4 +15,4 @@ var/lib/noosfero-data/public/thumbnails usr/share/noosfero/public/th @@ -15,4 +15,4 @@ var/lib/noosfero-data/public/thumbnails usr/share/noosfero/public/th
15 usr/share/noosfero/public/designs/themes/noosfero usr/share/noosfero/public/designs/themes/default 15 usr/share/noosfero/public/designs/themes/noosfero usr/share/noosfero/public/designs/themes/default
16 usr/share/noosfero/public/designs/icons/tango usr/share/noosfero/public/designs/icons/default 16 usr/share/noosfero/public/designs/icons/tango usr/share/noosfero/public/designs/icons/default
17 usr/share/noosfero/script/noosfero-plugins usr/sbin/noosfero-plugins 17 usr/share/noosfero/script/noosfero-plugins usr/sbin/noosfero-plugins
18 -usr/share/noosfero/Gemfile.lock /dev/null 18 +/dev/null usr/share/noosfero/Gemfile.lock
test/unit/task_mailer_test.rb
  Diff comments   View file @63ed413
@@ -18,7 +18,7 @@ class TaskMailerTest < ActiveSupport::TestCase @@ -18,7 +18,7 @@ class TaskMailerTest < ActiveSupport::TestCase
18 task.expects(:target_notification_description).returns('the task') 18 task.expects(:target_notification_description).returns('the task')
19 19
20 requestor = mock() 20 requestor = mock()
21 - requestor.expects(:notification_emails).returns(['requestor@example.com']) 21 + requestor.expects(:notification_emails).returns(['requestor@example.com']).at_least_once
22 requestor.expects(:name).returns('my name') 22 requestor.expects(:name).returns('my name')
23 23
24 environment = mock() 24 environment = mock()
@@ -41,7 +41,7 @@ class TaskMailerTest < ActiveSupport::TestCase @@ -41,7 +41,7 @@ class TaskMailerTest < ActiveSupport::TestCase
41 task.expects(:target_notification_description).returns('the task') 41 task.expects(:target_notification_description).returns('the task')
42 42
43 requestor = mock() 43 requestor = mock()
44 - requestor.expects(:notification_emails).returns(['requestor@example.com']) 44 + requestor.expects(:notification_emails).returns(['requestor@example.com']).at_least_once
45 requestor.expects(:name).returns('my name') 45 requestor.expects(:name).returns('my name')
46 46
47 environment = mock() 47 environment = mock()
@@ -65,7 +65,7 @@ class TaskMailerTest < ActiveSupport::TestCase @@ -65,7 +65,7 @@ class TaskMailerTest < ActiveSupport::TestCase
65 task.expects(:target_notification_description).returns('the task') 65 task.expects(:target_notification_description).returns('the task')
66 66
67 requestor = mock() 67 requestor = mock()
68 - requestor.expects(:notification_emails).returns(['requestor@example.com']) 68 + requestor.expects(:notification_emails).returns(['requestor@example.com']).at_least_once
69 requestor.expects(:name).returns('my name') 69 requestor.expects(:name).returns('my name')
70 70
71 environment = mock() 71 environment = mock()