Welcome to mirror list, hosted at ThFree Co, Russian Federation.

gitlab.com/gitlab-org/gitlab-foss.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorVinnie Okada <vokada@mrvinn.com>2014-09-24 05:19:16 +0400
committerVinnie Okada <vokada@mrvinn.com>2014-09-26 23:55:45 +0400
commit97e2f8a0d991f189c7cb60aec3f2e1f17e928451 (patch)
tree131e011b519e9e24274b29ae359974a94ee99ba1 /spec/mailers
parentfd338d67159e6dffaf54fd42fbeddb3b17e4d49f (diff)
Update expected value in notify_spec
Prevent test failures when Gitlab is configured to use a port other than 80.
Diffstat (limited to 'spec/mailers')
-rw-r--r--spec/mailers/notify_spec.rb9
1 files changed, 7 insertions, 2 deletions
diff --git a/spec/mailers/notify_spec.rb b/spec/mailers/notify_spec.rb
index 799dce442cc..e06e8826e5c 100644
--- a/spec/mailers/notify_spec.rb
+++ b/spec/mailers/notify_spec.rb
@@ -44,7 +44,9 @@ describe Notify do
let(:example_site_path) { root_path }
let(:new_user) { create(:user, email: 'newguy@example.com', created_by_id: 1) }
- subject { Notify.new_user_email(new_user.id, new_user.password, 'kETLwRaayvigPq_x3SNM') }
+ token = 'kETLwRaayvigPq_x3SNM'
+
+ subject { Notify.new_user_email(new_user.id, new_user.password, token) }
it_behaves_like 'an email sent from GitLab'
@@ -65,7 +67,10 @@ describe Notify do
end
it 'includes a link for user to set password' do
- should have_body_text 'http://localhost/users/password/edit?reset_password_token=kETLwRaayvigPq_x3SNM'
+ params = "reset_password_token=#{token}"
+ should have_body_text(
+ %r{http://localhost(:\d+)?/users/password/edit\?#{params}}
+ )
end
it 'includes a link to the site' do