From 32849be901ce3afc751a15b273eb19312e7f434b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Bj=C3=B6rn=20Geuken?= Date: Mon, 20 Nov 2017 15:16:02 +0100 Subject: [PATCH 1/2] [ci] Update tests to use correct http verb Our tests for creating packages were testing get requests for a post route. Pair-programming with @DavidKang and @Ana06. --- .../spec/controllers/webui/project_controller_spec.rb | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/src/api/spec/controllers/webui/project_controller_spec.rb b/src/api/spec/controllers/webui/project_controller_spec.rb index 4f8287f92ee..3f5e00016ca 100644 --- a/src/api/spec/controllers/webui/project_controller_spec.rb +++ b/src/api/spec/controllers/webui/project_controller_spec.rb @@ -696,7 +696,7 @@ context "with a namespace called 'base'" do before do - get :create, params: { project: { name: 'my_project' }, ns: user.home_project_name } + post :create, params: { project: { name: 'my_project' }, ns: user.home_project_name } end it { expect(assigns(:project).name).to eq("#{user.home_project_name}:my_project") } @@ -705,7 +705,7 @@ context 'with a param called maintenance_project' do before do - get :create, params: { project: { name: 'my_project' }, ns: user.home_project_name, maintenance_project: true } + post :create, params: { project: { name: 'my_project' }, ns: user.home_project_name, maintenance_project: true } end it { expect(assigns(:project).kind).to eq('maintenance') } @@ -715,7 +715,7 @@ context 'with a param that disables a flag' do shared_examples "a param that creates a disabled flag" do |param_name, flag_name| before do - get :create, params: { :project => { name: 'my_project' }, :ns => user.home_project_name, param_name.to_sym => true } + post :create, params: { :project => { name: 'my_project' }, :ns => user.home_project_name, param_name.to_sym => true } end it { expect(assigns(:project).flags.first.flag).to eq(flag_name) } @@ -730,7 +730,7 @@ context 'with an invalid project data' do before do - get :create, params: { project: { name: 'my invalid project' }, ns: user.home_project_name } + post :create, params: { project: { name: 'my invalid project' }, ns: user.home_project_name } end it { expect(flash[:error]).to start_with('Failed to save project') } @@ -1485,7 +1485,7 @@ end end - context 'without buildresult and no defaults set to a non-integer' do + context 'without buildresult and defaults set to a non-integer' do before do allow(Buildresult).to receive(:find).and_return(nil) post :monitor, params: { project: user.home_project, defaults: 'abc'} From 72327b5201c9b4e097957562631e75d782c96d89 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Bj=C3=B6rn=20Geuken?= Date: Mon, 20 Nov 2017 15:20:25 +0100 Subject: [PATCH 2/2] [ci] Update tests to use correct http verb Our tests project monitoring were testing a get route with a post requests. Pair-programming with @DavidKang and @Ana06. --- src/api/spec/controllers/webui/project_controller_spec.rb | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/src/api/spec/controllers/webui/project_controller_spec.rb b/src/api/spec/controllers/webui/project_controller_spec.rb index 3f5e00016ca..cd389f02d39 100644 --- a/src/api/spec/controllers/webui/project_controller_spec.rb +++ b/src/api/spec/controllers/webui/project_controller_spec.rb @@ -1383,7 +1383,7 @@ context 'without buildresult' do before do allow(Buildresult).to receive(:find).and_return(nil) - post :monitor, params: { project: user.home_project, defaults: '1'} + get :monitor, params: { project: user.home_project, defaults: '1'} end it { expect(flash[:warning]).not_to be_nil } @@ -1393,7 +1393,7 @@ context 'without buildresult and with failed param set to an integer' do before do allow(Buildresult).to receive(:find).and_return(nil) - post :monitor, params: { project: user.home_project, defaults: '1', failed: '2'} + get :monitor, params: { project: user.home_project, defaults: '1', failed: '2'} end it { expect(response).to redirect_to(project_show_path(user.home_project)) } @@ -1402,7 +1402,7 @@ context 'without buildresult and with failed param set to a string' do before do allow(Buildresult).to receive(:find).and_return(nil) - post :monitor, params: { project: user.home_project, defaults: '1', failed: 'abc'} + get :monitor, params: { project: user.home_project, defaults: '1', failed: 'abc'} end it { expect(response).to redirect_to(project_show_path(user.home_project)) }