Commit f8b29b06 authored by Alessio Caiazza's avatar Alessio Caiazza

Fix static analysis 💚

parent dc350a1c
...@@ -58,7 +58,7 @@ describe Projects::Clusters::UserController do ...@@ -58,7 +58,7 @@ describe Projects::Clusters::UserController do
project.add_master(user) project.add_master(user)
sign_in(user) sign_in(user)
end end
context 'when creates a cluster' do context 'when creates a cluster' do
it 'creates a new cluster' do it 'creates a new cluster' do
expect(ClusterProvisionWorker).to receive(:perform_async) expect(ClusterProvisionWorker).to receive(:perform_async)
......
...@@ -18,11 +18,11 @@ describe Projects::ClustersController do ...@@ -18,11 +18,11 @@ describe Projects::ClustersController do
context 'when project has a cluster' do context 'when project has a cluster' do
let!(:cluster) { create(:cluster, :provided_by_gcp, projects: [project]) } let!(:cluster) { create(:cluster, :provided_by_gcp, projects: [project]) }
it { expect(go).to redirect_to(namespace_project_cluster_path(project.namespace, project, project.cluster)) } it { expect(go).to redirect_to(project_cluster_path(project, project.cluster)) }
end end
context 'when project does not have a cluster' do context 'when project does not have a cluster' do
it { expect(go).to redirect_to(new_namespace_project_cluster_path(project.namespace, project)) } it { expect(go).to redirect_to(new_project_cluster_path(project)) }
end end
end end
...@@ -146,7 +146,7 @@ describe Projects::ClustersController do ...@@ -146,7 +146,7 @@ describe Projects::ClustersController do
go go
cluster.reload cluster.reload
expect(response).to redirect_to(namespace_project_cluster_path(project.namespace, project, project.cluster)) expect(response).to redirect_to(project_cluster_path(project, project.cluster))
expect(flash[:notice]).to eq('Cluster was successfully updated.') expect(flash[:notice]).to eq('Cluster was successfully updated.')
expect(cluster.enabled).to be_falsey expect(cluster.enabled).to be_falsey
end end
...@@ -197,7 +197,7 @@ describe Projects::ClustersController do ...@@ -197,7 +197,7 @@ describe Projects::ClustersController do
go go
cluster.reload cluster.reload
expect(response).to redirect_to(namespace_project_cluster_path(project.namespace, project, project.cluster)) expect(response).to redirect_to(project_cluster_path(project, project.cluster))
expect(flash[:notice]).to eq('Cluster was successfully updated.') expect(flash[:notice]).to eq('Cluster was successfully updated.')
expect(cluster.enabled).to be_falsey expect(cluster.enabled).to be_falsey
expect(cluster.name).to eq('my-new-cluster-name') expect(cluster.name).to eq('my-new-cluster-name')
...@@ -237,8 +237,8 @@ describe Projects::ClustersController do ...@@ -237,8 +237,8 @@ describe Projects::ClustersController do
def go def go
put :update, params.merge(namespace_id: project.namespace, put :update, params.merge(namespace_id: project.namespace,
project_id: project, project_id: project,
id: cluster) id: cluster)
end end
end end
...@@ -261,7 +261,7 @@ describe Projects::ClustersController do ...@@ -261,7 +261,7 @@ describe Projects::ClustersController do
.and change { Clusters::Platforms::Kubernetes.count }.by(-1) .and change { Clusters::Platforms::Kubernetes.count }.by(-1)
.and change { Clusters::Providers::Gcp.count }.by(-1) .and change { Clusters::Providers::Gcp.count }.by(-1)
expect(response).to redirect_to(namespace_project_clusters_path(project.namespace, project)) expect(response).to redirect_to(project_clusters_path(project))
expect(flash[:notice]).to eq('Cluster integration was successfully removed.') expect(flash[:notice]).to eq('Cluster integration was successfully removed.')
end end
end end
...@@ -274,7 +274,7 @@ describe Projects::ClustersController do ...@@ -274,7 +274,7 @@ describe Projects::ClustersController do
.to change { Clusters::Cluster.count }.by(-1) .to change { Clusters::Cluster.count }.by(-1)
.and change { Clusters::Providers::Gcp.count }.by(-1) .and change { Clusters::Providers::Gcp.count }.by(-1)
expect(response).to redirect_to(namespace_project_clusters_path(project.namespace, project)) expect(response).to redirect_to(project_clusters_path(project))
expect(flash[:notice]).to eq('Cluster integration was successfully removed.') expect(flash[:notice]).to eq('Cluster integration was successfully removed.')
end end
end end
...@@ -290,7 +290,7 @@ describe Projects::ClustersController do ...@@ -290,7 +290,7 @@ describe Projects::ClustersController do
.and change { Clusters::Platforms::Kubernetes.count }.by(-1) .and change { Clusters::Platforms::Kubernetes.count }.by(-1)
.and change { Clusters::Providers::Gcp.count }.by(0) .and change { Clusters::Providers::Gcp.count }.by(0)
expect(response).to redirect_to(namespace_project_clusters_path(project.namespace, project)) expect(response).to redirect_to(project_clusters_path(project))
expect(flash[:notice]).to eq('Cluster integration was successfully removed.') expect(flash[:notice]).to eq('Cluster integration was successfully removed.')
end end
end end
......
...@@ -18,7 +18,7 @@ feature 'Clusters Applications', :js do ...@@ -18,7 +18,7 @@ feature 'Clusters Applications', :js do
context 'when cluster is being created' do context 'when cluster is being created' do
let(:cluster) { create(:cluster, :providing_by_gcp, projects: [project])} let(:cluster) { create(:cluster, :providing_by_gcp, projects: [project])}
scenario 'user is unable to install applications' do scenario 'user is unable to install applications' do
page.within('.js-cluster-application-row-helm') do page.within('.js-cluster-application-row-helm') do
expect(page.find(:css, '.js-cluster-application-install-button')['disabled']).to eq('true') expect(page.find(:css, '.js-cluster-application-install-button')['disabled']).to eq('true')
......
...@@ -89,18 +89,18 @@ feature 'Gcp Cluster', :js do ...@@ -89,18 +89,18 @@ feature 'Gcp Cluster', :js do
page.find(:css, '.js-toggle-cluster').click page.find(:css, '.js-toggle-cluster').click
click_button 'Save' click_button 'Save'
end end
it 'user sees the successful message' do it 'user sees the successful message' do
expect(page).to have_content('Cluster was successfully updated.') expect(page).to have_content('Cluster was successfully updated.')
end end
end end
context 'when user changes cluster parameters' do context 'when user changes cluster parameters' do
before do before do
fill_in 'cluster_platform_kubernetes_attributes_namespace', with: 'my-namespace' fill_in 'cluster_platform_kubernetes_attributes_namespace', with: 'my-namespace'
click_button 'Save changes' click_button 'Save changes'
end end
it 'user sees the successful message' do it 'user sees the successful message' do
expect(page).to have_content('Cluster was successfully updated.') expect(page).to have_content('Cluster was successfully updated.')
expect(cluster.reload.platform_kubernetes.namespace).to eq('my-namespace') expect(cluster.reload.platform_kubernetes.namespace).to eq('my-namespace')
...@@ -113,7 +113,7 @@ feature 'Gcp Cluster', :js do ...@@ -113,7 +113,7 @@ feature 'Gcp Cluster', :js do
click_link 'Remove integration' click_link 'Remove integration'
end end
end end
it 'user sees creation form with the successful message' do it 'user sees creation form with the successful message' do
expect(page).to have_content('Cluster integration was successfully removed.') expect(page).to have_content('Cluster integration was successfully removed.')
expect(page).to have_link('Create on GKE') expect(page).to have_link('Create on GKE')
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment