From b4308842deb79c1364302188a41c6e37c14b62ec Mon Sep 17 00:00:00 2001 From: Dennis Tang Date: Mon, 28 May 2018 18:15:12 +0200 Subject: fix more rspec tests --- spec/features/projects/clusters/gcp_spec.rb | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) (limited to 'spec/features/projects/clusters/gcp_spec.rb') diff --git a/spec/features/projects/clusters/gcp_spec.rb b/spec/features/projects/clusters/gcp_spec.rb index 5071a87fa5b..2eb79c9b282 100644 --- a/spec/features/projects/clusters/gcp_spec.rb +++ b/spec/features/projects/clusters/gcp_spec.rb @@ -16,9 +16,9 @@ feature 'Gcp Cluster', :js do let(:project_id) { 'test-project-1234' } before do - allow_any_instance_of(Projects::Clusters::GcpController) + allow_any_instance_of(Projects::ClustersController) .to receive(:token_in_session).and_return('token') - allow_any_instance_of(Projects::Clusters::GcpController) + allow_any_instance_of(Projects::ClustersController) .to receive(:expires_at_in_session).and_return(1.hour.since.to_i.to_s) end @@ -27,7 +27,7 @@ feature 'Gcp Cluster', :js do visit project_clusters_path(project) click_link 'Add Kubernetes cluster' - click_link 'Create on Google Kubernetes Engine' + click_link 'Create new Cluster on GKE' end context 'when user filled form with valid parameters' do @@ -139,7 +139,7 @@ feature 'Gcp Cluster', :js do visit project_clusters_path(project) click_link 'Add Kubernetes cluster' - click_link 'Create on Google Kubernetes Engine' + click_link 'Create new Cluster on GKE' end it 'user sees a login page' do @@ -165,7 +165,7 @@ feature 'Gcp Cluster', :js do it 'user sees offer on cluster GCP login page' do click_link 'Add Kubernetes cluster' - click_link 'Create on Google Kubernetes Engine' + click_link 'Create new Cluster on GKE' expect(page).to have_css('.gcp-signup-offer') end -- cgit v1.2.1 From cc0305565704e8f713cd615f5a6767498bd03706 Mon Sep 17 00:00:00 2001 From: Dennis Tang Date: Wed, 6 Jun 2018 08:43:31 -0700 Subject: fix gcp_spec.rb --- spec/features/projects/clusters/gcp_spec.rb | 4 ++++ 1 file changed, 4 insertions(+) (limited to 'spec/features/projects/clusters/gcp_spec.rb') diff --git a/spec/features/projects/clusters/gcp_spec.rb b/spec/features/projects/clusters/gcp_spec.rb index 0ebe3459a65..31c0735f577 100644 --- a/spec/features/projects/clusters/gcp_spec.rb +++ b/spec/features/projects/clusters/gcp_spec.rb @@ -20,6 +20,10 @@ feature 'Gcp Cluster', :js do .to receive(:token_in_session).and_return('token') allow_any_instance_of(Projects::ClustersController) .to receive(:expires_at_in_session).and_return(1.hour.since.to_i.to_s) + allow_any_instance_of(Projects::Clusters::GcpController) + .to receive(:token_in_session).and_return('token') + allow_any_instance_of(Projects::Clusters::GcpController) + .to receive(:expires_at_in_session).and_return(1.hour.since.to_i.to_s) end context 'when user does not have a cluster and visits cluster index page' do -- cgit v1.2.1 From ce0ce1cb196e924b13631565114352ed89eba5af Mon Sep 17 00:00:00 2001 From: Dennis Tang Date: Mon, 11 Jun 2018 22:57:04 -0700 Subject: consolidate back into one controller --- spec/features/projects/clusters/gcp_spec.rb | 4 ---- 1 file changed, 4 deletions(-) (limited to 'spec/features/projects/clusters/gcp_spec.rb') diff --git a/spec/features/projects/clusters/gcp_spec.rb b/spec/features/projects/clusters/gcp_spec.rb index 31c0735f577..0ebe3459a65 100644 --- a/spec/features/projects/clusters/gcp_spec.rb +++ b/spec/features/projects/clusters/gcp_spec.rb @@ -20,10 +20,6 @@ feature 'Gcp Cluster', :js do .to receive(:token_in_session).and_return('token') allow_any_instance_of(Projects::ClustersController) .to receive(:expires_at_in_session).and_return(1.hour.since.to_i.to_s) - allow_any_instance_of(Projects::Clusters::GcpController) - .to receive(:token_in_session).and_return('token') - allow_any_instance_of(Projects::Clusters::GcpController) - .to receive(:expires_at_in_session).and_return(1.hour.since.to_i.to_s) end context 'when user does not have a cluster and visits cluster index page' do -- cgit v1.2.1