Download as
Browse Code »

Commit d2d7d6651668c287c0305d546481d445abbb9201

Authored by Rodrigo Souto
1 parent e1091633
Exists in staging and in 42 other branches all_pending_tasks_api, api-articles-period, api_roles, caching-rails4, captcha_serpro_plugin, comments_permissions, content-manager-hostspot, elasticsearch, elasticsearch_api, elasticsearch_categories, elasticsearch_filter, elasticsearch_sort, elasticsearch_to_merge, elasticsearch_view, environment-exposes-api, export-comment-api, export-comment-paragraph, export_data, external_followers, federation-webfinger, federation_followers, federation_followers_backend, federation_oauth_provider, federation_webfinger, fix_event_date_issue, fix_notification_email, fix_string_downcase_and_upcase, follower_permition, json_cookie_serializer, login-captcha, master, master_profile_followers, oauth_external_login, oauth_login, private-scraps, private-scraps-rebase, production, production-vendorized, profile_api_improvements, tasks_keep_filter_params, user_mention, webfinger_server

rails3: fix change_password tests

Showing 2 changed files with 3 additions and 2 deletions   Show diff stats
app/models/change_password.rb
  Diff comments   View file @d2d7d66
@@ -86,7 +86,7 @@ class ChangePassword < Task @@ -86,7 +86,7 @@ class ChangePassword < Task
86 code = self.code 86 code = self.code
87 url = url_for(:host => hostname, :controller => 'account', :action => 'new_password', :code => code) 87 url = url_for(:host => hostname, :controller => 'account', :action => 'new_password', :code => code)
88 88
89 - lambda do 89 + proc do
90 _("In order to change your password, please visit the following address:\n\n%s") % url 90 _("In order to change your password, please visit the following address:\n\n%s") % url
91 end 91 end
92 end 92 end
test/unit/change_password_test.rb
  Diff comments   View file @d2d7d66
@@ -144,8 +144,9 @@ class ChangePasswordTest < ActiveSupport::TestCase @@ -144,8 +144,9 @@ class ChangePasswordTest < ActiveSupport::TestCase
144 person = fast_create(Person, :identifier => 'testuser') 144 person = fast_create(Person, :identifier => 'testuser')
145 145
146 task = ChangePassword.create(:login => 'testuser', :email => 'test@example.com', :environment_id => Environment.default.id) 146 task = ChangePassword.create(:login => 'testuser', :email => 'test@example.com', :environment_id => Environment.default.id)
  147 + task.requestor.stubs(:notification_emails).returns(['random@example.org'])
147 148
148 - email = TaskMailer.deliver_task_created(task) 149 + email = task.send(:send_notification, :created).deliver
149 assert_match(/#{task.requestor.name} wants to change its password/, email.subject) 150 assert_match(/#{task.requestor.name} wants to change its password/, email.subject)
150 end 151 end
151 152