diff options
author | Rémy Coutable <remy@rymai.me> | 2018-06-18 09:19:40 +0000 |
---|---|---|
committer | Rémy Coutable <remy@rymai.me> | 2018-06-18 09:19:40 +0000 |
commit | 781e0da9443ae0aa9937942a9adf67ef647ba7be (patch) | |
tree | 784475d9be8f1d34bd3d9e0fcc6752a4334c70b7 | |
parent | 52f53c2e0b814cccd97c4c25e07ba6de7cd7fbc3 (diff) | |
parent | 79c3ec014c7db667457268a75f9c47bee8653650 (diff) | |
download | gitlab-ce-781e0da9443ae0aa9937942a9adf67ef647ba7be.tar.gz |
Merge branch 'blackst0ne-rails5-expected-search-search-seed_project-got-nil' into 'master'
Resolve "[Rails5] expected: "/search?search=seed_project" got: nil"
Closes #48013
See merge request gitlab-org/gitlab-ce!19936
-rw-r--r-- | changelogs/unreleased/blackst0ne-rails5-expected-search-search-seed_project-got-nil.yml | 5 | ||||
-rw-r--r-- | spec/controllers/sessions_controller_spec.rb | 10 |
2 files changed, 10 insertions, 5 deletions
diff --git a/changelogs/unreleased/blackst0ne-rails5-expected-search-search-seed_project-got-nil.yml b/changelogs/unreleased/blackst0ne-rails5-expected-search-search-seed_project-got-nil.yml new file mode 100644 index 00000000000..e7bb2703b03 --- /dev/null +++ b/changelogs/unreleased/blackst0ne-rails5-expected-search-search-seed_project-got-nil.yml @@ -0,0 +1,5 @@ +--- +title: "[Rails5] Fix sessions_controller_spec" +merge_request: 19936 +author: "@blackst0ne" +type: fixed diff --git a/spec/controllers/sessions_controller_spec.rb b/spec/controllers/sessions_controller_spec.rb index 555b186fe31..2b61e0d4a85 100644 --- a/spec/controllers/sessions_controller_spec.rb +++ b/spec/controllers/sessions_controller_spec.rb @@ -257,15 +257,15 @@ describe SessionsController do end end - describe '#new' do + describe "#new" do before do set_devise_mapping(context: @request) end - it 'redirects correctly for referer on same host with params' do - search_path = '/search?search=seed_project' - allow(controller.request).to receive(:referer) - .and_return('http://%{host}%{path}' % { host: 'test.host', path: search_path }) + it "redirects correctly for referer on same host with params" do + host = "test.host" + search_path = "/search?search=seed_project" + request.headers[:HTTP_REFERER] = "http://#{host}#{search_path}" get(:new, redirect_to_referer: :yes) |