From 91463e52467d4b93d95693ac4eba1d5630ecdc98 Mon Sep 17 00:00:00 2001 From: Tiago Botelho Date: Tue, 26 Jun 2018 10:36:16 +0100 Subject: Specify environment actions to distinguish between metrics and every other environment related actions --- spec/controllers/projects/environments_controller_spec.rb | 10 ++++++++++ 1 file changed, 10 insertions(+) (limited to 'spec/controllers') diff --git a/spec/controllers/projects/environments_controller_spec.rb b/spec/controllers/projects/environments_controller_spec.rb index 47d4942acbd..36ebbc8a016 100644 --- a/spec/controllers/projects/environments_controller_spec.rb +++ b/spec/controllers/projects/environments_controller_spec.rb @@ -277,6 +277,16 @@ describe Projects::EnvironmentsController do end end + describe 'GET #empty' do + it 'responds with HTML' do + get :empty, namespace_id: project.namespace, + project_id: project + + expect(response).to be_ok + expect(response).to render_template 'empty' + end + end + describe 'GET #metrics' do before do allow(controller).to receive(:environment).and_return(environment) -- cgit v1.2.3 From dd467d6c758b485938553f312ee276fd54e63384 Mon Sep 17 00:00:00 2001 From: Tiago Botelho Date: Thu, 28 Jun 2018 11:54:02 +0200 Subject: Prevents project first environment from being fetched in every project view --- .../projects/environments_controller_spec.rb | 18 ++++++++++++++++++ 1 file changed, 18 insertions(+) (limited to 'spec/controllers') diff --git a/spec/controllers/projects/environments_controller_spec.rb b/spec/controllers/projects/environments_controller_spec.rb index 36ebbc8a016..f6ce4c20d5b 100644 --- a/spec/controllers/projects/environments_controller_spec.rb +++ b/spec/controllers/projects/environments_controller_spec.rb @@ -287,6 +287,24 @@ describe Projects::EnvironmentsController do end end + describe 'GET #metrics_redirect' do + let(:project) { create(:project) } + + it 'redirects to environment if it exists' do + environment = create(:environment, name: 'production', project: project) + + get :metrics_redirect, environment_params + + expect(response).to redirect_to(environment_metrics_path(environment)) + end + + it 'redirects to empty page if no environment exists' do + get :metrics_redirect, environment_params + + expect(response).to redirect_to(empty_project_environments_path(project)) + end + end + describe 'GET #metrics' do before do allow(controller).to receive(:environment).and_return(environment) -- cgit v1.2.3 From c9a7145a100d24c6dbed98d11b0bc3af7a97cdb7 Mon Sep 17 00:00:00 2001 From: Tiago Botelho Date: Fri, 29 Jun 2018 10:02:32 +0200 Subject: Remove GET empty from EnvironmentsController --- spec/controllers/projects/environments_controller_spec.rb | 13 ++----------- 1 file changed, 2 insertions(+), 11 deletions(-) (limited to 'spec/controllers') diff --git a/spec/controllers/projects/environments_controller_spec.rb b/spec/controllers/projects/environments_controller_spec.rb index f6ce4c20d5b..cb561e24762 100644 --- a/spec/controllers/projects/environments_controller_spec.rb +++ b/spec/controllers/projects/environments_controller_spec.rb @@ -277,16 +277,6 @@ describe Projects::EnvironmentsController do end end - describe 'GET #empty' do - it 'responds with HTML' do - get :empty, namespace_id: project.namespace, - project_id: project - - expect(response).to be_ok - expect(response).to render_template 'empty' - end - end - describe 'GET #metrics_redirect' do let(:project) { create(:project) } @@ -301,7 +291,8 @@ describe Projects::EnvironmentsController do it 'redirects to empty page if no environment exists' do get :metrics_redirect, environment_params - expect(response).to redirect_to(empty_project_environments_path(project)) + expect(response).to be_ok + expect(response).to render_template 'empty' end end -- cgit v1.2.3 From 55e2df6c804202a39d0165289988062a693087aa Mon Sep 17 00:00:00 2001 From: Tiago Botelho Date: Mon, 2 Jul 2018 13:02:06 +0100 Subject: Fixes backend specs --- spec/controllers/projects/environments_controller_spec.rb | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'spec/controllers') diff --git a/spec/controllers/projects/environments_controller_spec.rb b/spec/controllers/projects/environments_controller_spec.rb index cb561e24762..63cef579864 100644 --- a/spec/controllers/projects/environments_controller_spec.rb +++ b/spec/controllers/projects/environments_controller_spec.rb @@ -283,13 +283,13 @@ describe Projects::EnvironmentsController do it 'redirects to environment if it exists' do environment = create(:environment, name: 'production', project: project) - get :metrics_redirect, environment_params + get :metrics_redirect, namespace_id: project.namespace, project_id: project expect(response).to redirect_to(environment_metrics_path(environment)) end it 'redirects to empty page if no environment exists' do - get :metrics_redirect, environment_params + get :metrics_redirect, namespace_id: project.namespace, project_id: project expect(response).to be_ok expect(response).to render_template 'empty' -- cgit v1.2.3