summaryrefslogtreecommitdiff
path: root/spec/controllers
diff options
context:
space:
mode:
Diffstat (limited to 'spec/controllers')
-rw-r--r--spec/controllers/ci/projects_controller_spec.rb4
-rw-r--r--spec/controllers/projects/merge_requests_controller_spec.rb6
-rw-r--r--spec/controllers/sessions_controller_spec.rb20
3 files changed, 15 insertions, 15 deletions
diff --git a/spec/controllers/ci/projects_controller_spec.rb b/spec/controllers/ci/projects_controller_spec.rb
index 86f01f437a2..3cd955dc9d4 100644
--- a/spec/controllers/ci/projects_controller_spec.rb
+++ b/spec/controllers/ci/projects_controller_spec.rb
@@ -33,8 +33,8 @@ describe Ci::ProjectsController do
shared_examples 'badge provider' do
it 'shows badge' do
expect(response.status).to eq 200
- expect(response.headers)
- .to include('Content-Type' => 'image/svg+xml')
+ expect(response.headers).
+ to include('Content-Type' => 'image/svg+xml')
end
end
diff --git a/spec/controllers/projects/merge_requests_controller_spec.rb b/spec/controllers/projects/merge_requests_controller_spec.rb
index f84f922ba5e..1c5dbda0de2 100644
--- a/spec/controllers/projects/merge_requests_controller_spec.rb
+++ b/spec/controllers/projects/merge_requests_controller_spec.rb
@@ -334,9 +334,9 @@ describe Projects::MergeRequestsController do
it 'sets the MR to merge when the build succeeds' do
service = double(:merge_when_build_succeeds_service)
- expect(MergeRequests::MergeWhenPipelineSucceedsService)
- .to receive(:new).with(project, anything, anything)
- .and_return(service)
+ expect(MergeRequests::MergeWhenPipelineSucceedsService).
+ to receive(:new).with(project, anything, anything).
+ and_return(service)
expect(service).to receive(:execute).with(merge_request)
merge_when_build_succeeds
diff --git a/spec/controllers/sessions_controller_spec.rb b/spec/controllers/sessions_controller_spec.rb
index b56c7880b64..d951325f765 100644
--- a/spec/controllers/sessions_controller_spec.rb
+++ b/spec/controllers/sessions_controller_spec.rb
@@ -11,8 +11,8 @@ describe SessionsController do
it 'does not authenticate user' do
post(:create, user: { login: 'invalid', password: 'invalid' })
- expect(response)
- .to set_flash.now[:alert].to /Invalid Login or password/
+ expect(response).
+ to set_flash.now[:alert].to /Invalid Login or password/
end
end
@@ -102,8 +102,8 @@ describe SessionsController do
end
it 'warns about invalid OTP code' do
- expect(response).to set_flash.now[:alert]
- .to /Invalid two-factor code/
+ expect(response).to set_flash.now[:alert].
+ to /Invalid two-factor code/
end
end
end
@@ -129,8 +129,8 @@ describe SessionsController do
end
it 'warns about invalid login' do
- expect(response).to set_flash.now[:alert]
- .to /Invalid Login or password/
+ expect(response).to set_flash.now[:alert].
+ to /Invalid Login or password/
end
it 'locks the user' do
@@ -140,8 +140,8 @@ describe SessionsController do
it 'keeps the user locked on future login attempts' do
post(:create, user: { login: user.username, password: user.password })
- expect(response)
- .to set_flash.now[:alert].to /Invalid Login or password/
+ expect(response).
+ to set_flash.now[:alert].to /Invalid Login or password/
end
end
end
@@ -153,8 +153,8 @@ describe SessionsController do
authenticate_2fa(login: another_user.username,
otp_attempt: 'invalid')
- expect(response).to set_flash.now[:alert]
- .to /Invalid two-factor code/
+ expect(response).to set_flash.now[:alert].
+ to /Invalid two-factor code/
end
end
end