summaryrefslogtreecommitdiff
path: root/spec/controllers/profiles_controller_spec.rb
diff options
context:
space:
mode:
authorBrett Walker <brett@digitalmoksha.com>2017-09-24 19:52:49 +0200
committerBrett Walker <brett@digitalmoksha.com>2017-09-24 19:52:49 +0200
commitd97b577a1bee80bd79209d2e6d501d1cd93debcc (patch)
tree660edfe661e2e8c3e14aa3a1986dfecc70eb7d46 /spec/controllers/profiles_controller_spec.rb
parentd7d335c05b9ae359b72f59c31bbe5ed059df7f52 (diff)
downloadgitlab-ce-d97b577a1bee80bd79209d2e6d501d1cd93debcc.tar.gz
must now set the devise default scope (since we now have an :email scope)
and rubocop fixes
Diffstat (limited to 'spec/controllers/profiles_controller_spec.rb')
-rw-r--r--spec/controllers/profiles_controller_spec.rb2
1 files changed, 1 insertions, 1 deletions
diff --git a/spec/controllers/profiles_controller_spec.rb b/spec/controllers/profiles_controller_spec.rb
index 3fb631a6fac..ce5040ff02b 100644
--- a/spec/controllers/profiles_controller_spec.rb
+++ b/spec/controllers/profiles_controller_spec.rb
@@ -17,7 +17,7 @@ describe ProfilesController do
it "allows an email update without confirmation if existing verified email" do
user = create(:user)
- email = create(:email, :confirmed, user: user, email: 'john@gmail.com')
+ create(:email, :confirmed, user: user, email: 'john@gmail.com')
sign_in(user)
put :update,