diff options
author | Marin Jankovski <maxlazio@gmail.com> | 2016-03-14 11:40:17 +0100 |
---|---|---|
committer | Marin Jankovski <maxlazio@gmail.com> | 2016-03-14 11:40:17 +0100 |
commit | 90c10f4dab503aeb24d7ca44e48fc0a607832760 (patch) | |
tree | d36d9f67286928820c401e2f4c7c321e47069480 /spec | |
parent | c07ef544d1eac5e6d838e1cd8826dee93ddd365e (diff) | |
parent | 8e7661c218c1d9c6fd856af69cabc77c1cd0d22d (diff) | |
download | gitlab-ce-90c10f4dab503aeb24d7ca44e48fc0a607832760.tar.gz |
Merge branch 'master' of dev.gitlab.org:gitlab/gitlabhq
Diffstat (limited to 'spec')
-rw-r--r-- | spec/controllers/projects/imports_controller_spec.rb | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/spec/controllers/projects/imports_controller_spec.rb b/spec/controllers/projects/imports_controller_spec.rb index 0147bd2b953..2acbba469e3 100644 --- a/spec/controllers/projects/imports_controller_spec.rb +++ b/spec/controllers/projects/imports_controller_spec.rb @@ -19,7 +19,7 @@ describe Projects::ImportsController do end it 'sets flash.now if params is present' do - get :show, namespace_id: project.namespace.to_param, project_id: project.to_param, continue: { notice_now: 'Started' } + get :show, namespace_id: project.namespace.to_param, project_id: project.to_param, continue: { to: '/', notice_now: 'Started' } expect(flash.now[:notice]).to eq 'Started' end @@ -45,7 +45,7 @@ describe Projects::ImportsController do end it 'sets flash.now if params is present' do - get :show, namespace_id: project.namespace.to_param, project_id: project.to_param, continue: { notice_now: 'In progress' } + get :show, namespace_id: project.namespace.to_param, project_id: project.to_param, continue: { to: '/', notice_now: 'In progress' } expect(flash.now[:notice]).to eq 'In progress' end |