diff options
author | Lin Jen-Shin <godfat@godfat.org> | 2017-10-25 15:39:23 +0300 |
---|---|---|
committer | Lin Jen-Shin <godfat@godfat.org> | 2017-10-25 15:39:23 +0300 |
commit | 47c5ecaff33f49cfdc5fd47f5baff9a13e3d3807 (patch) | |
tree | 8352b7ec74351f1324956a4c7c34c32a812816f1 /spec/controllers/profiles/accounts_controller_spec.rb | |
parent | 188e1c261edf70685a7ea9e4276cd9794f2029c3 (diff) | |
parent | e81d74b9253e4a9f48bad0071bf37075bb6a20c5 (diff) | |
download | gitlab-ce-47c5ecaff33f49cfdc5fd47f5baff9a13e3d3807.tar.gz |
Merge remote-tracking branch 'upstream/master' into use-git-branch-mergeduse-git-branch-merged
* upstream/master: (56 commits)
Resolve "Remove overzealous tooltips in projects page tabs"
Remove filter icon from search bar
Don't rename groups/projects that aren't reserved anymore
Memoize GitLab logger to reduce open file descriptors
Update groups API documentation
Changing the smallest of typos
Remove `<script>` and `<template>` from CHANGELOG.md
Support `Gitaly::User`'s gl_username field
Fix icon color and btn-group alignment of discussion buttons
Simple docs fixes
Fix button type
Changes after review
fixed karma tests
Removes group_avatar & group_label_subscription from global namespace
Fix CSS in load more participants
Fix the description of the new branch created by an issue's new branch button
Fix a small typo in the delete merged branches documentation
spec fixes
Remove Sherlock usage from the performance bar
moved to eventHub to manage creating new files removed an ID from the CSS
...
Diffstat (limited to 'spec/controllers/profiles/accounts_controller_spec.rb')
-rw-r--r-- | spec/controllers/profiles/accounts_controller_spec.rb | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/spec/controllers/profiles/accounts_controller_spec.rb b/spec/controllers/profiles/accounts_controller_spec.rb index d387aba227b..f8d9d7e39ee 100644 --- a/spec/controllers/profiles/accounts_controller_spec.rb +++ b/spec/controllers/profiles/accounts_controller_spec.rb @@ -11,7 +11,7 @@ describe Profiles::AccountsController do it 'renders 404 if someone tries to unlink a non existent provider' do delete :unlink, provider: 'github' - expect(response).to have_http_status(404) + expect(response).to have_gitlab_http_status(404) end [:saml, :cas3].each do |provider| @@ -23,7 +23,7 @@ describe Profiles::AccountsController do delete :unlink, provider: provider.to_s - expect(response).to have_http_status(302) + expect(response).to have_gitlab_http_status(302) expect(user.reload.identities).to include(identity) end end @@ -38,7 +38,7 @@ describe Profiles::AccountsController do delete :unlink, provider: provider.to_s - expect(response).to have_http_status(302) + expect(response).to have_gitlab_http_status(302) expect(user.reload.identities).not_to include(identity) end end |