diff options
author | Felipe Artur <felipefac@gmail.com> | 2016-06-29 11:31:50 -0300 |
---|---|---|
committer | Felipe Artur <felipefac@gmail.com> | 2016-06-29 11:32:38 -0300 |
commit | d2971315abd0e6e94860505e50ec71082c3679da (patch) | |
tree | 0f3dcf23406ec9fb3d6362b7f746e978ace692b3 /spec/controllers/application_controller_spec.rb | |
parent | 36d48120f66d52dcc8697893ca1ab85322ba7c8b (diff) | |
parent | bef4294c58e0bbadc01f633fc8bea514801de7ae (diff) | |
download | gitlab-ce-issue_3359_3.tar.gz |
Merge branch 'master' into issue_3359_3issue_3359_3
Diffstat (limited to 'spec/controllers/application_controller_spec.rb')
-rw-r--r-- | spec/controllers/application_controller_spec.rb | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/spec/controllers/application_controller_spec.rb b/spec/controllers/application_controller_spec.rb index ff5b3916273..10824c20c87 100644 --- a/spec/controllers/application_controller_spec.rb +++ b/spec/controllers/application_controller_spec.rb @@ -44,7 +44,7 @@ describe ApplicationController do context "when the 'private_token' param is populated with the private token" do it "logs the user in" do get :index, private_token: user.private_token - expect(response.status).to eq(200) + expect(response).to have_http_status(200) expect(response.body).to eq("authenticated") end end @@ -54,7 +54,7 @@ describe ApplicationController do it "logs the user in" do @request.headers['PRIVATE-TOKEN'] = user.private_token get :index - expect(response.status).to eq(200) + expect(response).to have_http_status(200) expect(response.body).to eq("authenticated") end end @@ -80,7 +80,7 @@ describe ApplicationController do context "when the 'personal_access_token' param is populated with the personal access token" do it "logs the user in" do get :index, private_token: personal_access_token.token - expect(response.status).to eq(200) + expect(response).to have_http_status(200) expect(response.body).to eq('authenticated') end end @@ -89,7 +89,7 @@ describe ApplicationController do it "logs the user in" do @request.headers["PRIVATE-TOKEN"] = personal_access_token.token get :index - expect(response.status).to eq(200) + expect(response).to have_http_status(200) expect(response.body).to eq('authenticated') end end |