Fix specs

1 files changed, 0 insertions, 245 deletions

diff --git a/spec/features/projects/clusters_spec.rb b/spec/features/projects/clusters_spec.rb
index ad515649202..8683d758b0a 100644
--- a/spec/features/projects/clusters_spec.rb
+++ b/spec/features/projects/clusters_spec.rb
@@ -11,252 +11,7 @@ feature 'Clusters', :js do
     gitlab_sign_in(user)
   end
 
-<<<<<<< HEAD
   context 'when user does not have a cluster and visits cluster index page' do
-=======
-  context 'when user has signed in Google' do
-    before do
-      allow_any_instance_of(Projects::ClustersController)
-        .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)
-    end
-
-    context 'when user does not have a cluster and visits cluster index page' do
-      before do
-        visit project_clusters_path(project)
-      end
-
-      it 'sees empty state' do
-        expect(page).to have_link('Add cluster')
-        expect(page).to have_selector('.empty-state')
-      end
-
-      context 'when user opens create on gke page' do
-        before do
-          click_link 'Add cluster'
-          click_link 'Create on GKE'
-        end
-
-        context 'when user filled form with valid parameters' do
-          before do
-            double.tap do |dbl|
-              allow(dbl).to receive(:status).and_return('RUNNING')
-              allow(dbl).to receive(:self_link)
-                .and_return('projects/gcp-project-12345/zones/us-central1-a/operations/ope-123')
-              allow_any_instance_of(GoogleApi::CloudPlatform::Client)
-                .to receive(:projects_zones_clusters_create).and_return(dbl)
-            end
-
-            allow(WaitForClusterCreationWorker).to receive(:perform_in).and_return(nil)
-
-            fill_in 'cluster_provider_gcp_attributes_gcp_project_id', with: 'gcp-project-123'
-            fill_in 'cluster_name', with: 'dev-cluster'
-            click_button 'Create cluster'
-          end
-
-          it 'user sees a cluster details page and creation status' do
-            expect(page).to have_content('Cluster is being created on Google Container Engine...')
-
-            # Application Installation buttons
-            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').text).to eq('Install')
-            end
-
-            Clusters::Cluster.last.provider.make_created!
-
-            expect(page).to have_content('Cluster was successfully created on Google Container Engine')
-          end
-
-          it 'user sees a error if something worng during creation' do
-            expect(page).to have_content('Cluster is being created on Google Container Engine...')
-
-            Clusters::Cluster.last.provider.make_errored!('Something wrong!')
-
-            expect(page).to have_content('Something wrong!')
-          end
-        end
-
-        context 'when user filled form with invalid parameters' do
-          before do
-            click_button 'Create cluster'
-          end
-
-          it 'user sees a validation error' do
-            expect(page).to have_css('#error_explanation')
-          end
-        end
-      end
-    end
-
-    context 'when user has a cluster and visits cluster index page' do
-      let!(:cluster) { create(:cluster, :project, :provided_by_gcp) }
-      let(:project) { cluster.project }
-
-      before do
-        visit project_clusters_path(project)
-      end
-
-      it 'user sees a table with one cluster' do
-        # One is the header row, the other the cluster row
-        expect(page).to have_selector('.gl-responsive-table-row', count: 2)
-      end
-
-      it 'user sees a disabled add cluster button ' do
-        expect(page).to have_selector('.js-add-cluster.disabled')
-      end
-
-      it 'user sees navigation tabs' do
-        expect(page.find('.js-active-tab').text).to include('Active')
-        expect(page.find('.js-active-tab .badge').text).to include('1')
-
-        expect(page.find('.js-inactive-tab').text).to include('Inactive')
-        expect(page.find('.js-inactive-tab .badge').text).to include('0')
-
-        expect(page.find('.js-all-tab').text).to include('All')
-        expect(page.find('.js-all-tab .badge').text).to include('1')
-      end
-
-      context 'update cluster' do
-        it 'user can update cluster' do
-          expect(page).to have_selector('.js-toggle-cluster-list')
-        end
-
-        context 'with sucessfull request' do
-          it 'user sees updated cluster' do
-            expect do
-              page.find('.js-toggle-cluster-list').click
-              wait_for_requests
-            end.to change { cluster.enabled }
-
-            expect(page).not_to have_selector('.is-checked')
-          end
-        end
-
-        context 'with failed request' do
-          it 'user sees not update cluster and error message' do
-            # Cluster was disabled in the last test
-            page.find('.js-toggle-cluster-list').click
-
-            Clusters::Cluster.last.provider.make_errored!('Something wrong!')
-
-            expect(page).not_to have_selector('.js-toggle-cluster-list.is-checked')
-          end
-        end
-      end
-
-      context 'when user clicks on a cluster' do
-        before do
-          click_link cluster.name
-        end
-
-        it 'user sees an cluster details page' do
-          expect(page).to have_button('Save')
-          expect(page.find(:css, '.cluster-name').value).to eq(cluster.name)
-
-          # Application Installation buttons
-          page.within('.js-cluster-application-row-helm') do
-            expect(page.find(:css, '.js-cluster-application-install-button')['disabled']).to be_nil
-            expect(page.find(:css, '.js-cluster-application-install-button')).to have_content('Install')
-          end
-        end
-
-        context 'when user installs application: Helm Tiller' do
-          before do
-            allow(ClusterInstallAppWorker).to receive(:perform_async).and_return(nil)
-
-            page.within('.js-cluster-application-row-helm') do
-              page.find(:css, '.js-cluster-application-install-button').click
-            end
-          end
-
-          it 'user sees status transition' do
-            page.within('.js-cluster-application-row-helm') do
-              # FE sends request and gets the response, then the buttons is "Install"
-              expect(page.find(:css, '.js-cluster-application-install-button')['disabled']).to eq('true')
-              expect(page.find(:css, '.js-cluster-application-install-button')).to have_content('Install')
-
-              Clusters::Cluster.last.application_helm.make_installing!
-
-              # FE starts polling and update the buttons to "Installing"
-              expect(page.find(:css, '.js-cluster-application-install-button')['disabled']).to eq('true')
-              expect(page.find(:css, '.js-cluster-application-install-button')).to have_content('Installing')
-
-              Clusters::Cluster.last.application_helm.make_installed!
-
-              expect(page.find(:css, '.js-cluster-application-install-button')['disabled']).to eq('true')
-              expect(page.find(:css, '.js-cluster-application-install-button')).to have_content('Installed')
-            end
-
-            expect(page).to have_content('Helm Tiller was successfully installed on your cluster')
-          end
-        end
-
-        context 'when user installs application: Ingress' do
-          before do
-            allow(ClusterInstallAppWorker).to receive(:perform_async).and_return(nil)
-            # Helm Tiller needs to be installed before you can install Ingress
-            create(:cluster_applications_helm, :installed, cluster: cluster)
-
-            visit project_cluster_path(project, cluster)
-
-            page.within('.js-cluster-application-row-ingress') do
-              page.find(:css, '.js-cluster-application-install-button').click
-            end
-          end
-
-          it 'user sees status transition' do
-            page.within('.js-cluster-application-row-ingress') do
-              # FE sends request and gets the response, then the buttons is "Install"
-              expect(page.find(:css, '.js-cluster-application-install-button')['disabled']).to eq('true')
-              expect(page.find(:css, '.js-cluster-application-install-button')).to have_content('Install')
-
-              Clusters::Cluster.last.application_ingress.make_installing!
-
-              # FE starts polling and update the buttons to "Installing"
-              expect(page.find(:css, '.js-cluster-application-install-button')['disabled']).to eq('true')
-              expect(page.find(:css, '.js-cluster-application-install-button')).to have_content('Installing')
-
-              Clusters::Cluster.last.application_ingress.make_installed!
-
-              expect(page.find(:css, '.js-cluster-application-install-button')['disabled']).to eq('true')
-              expect(page.find(:css, '.js-cluster-application-install-button')).to have_content('Installed')
-            end
-
-            expect(page).to have_content('Ingress was successfully installed on your cluster')
-          end
-        end
-
-        context 'when user disables the cluster' do
-          before do
-            page.find(:css, '.js-toggle-cluster').click
-            click_button 'Save'
-          end
-
-          it 'user sees the successful message' do
-            expect(page).to have_content('Cluster was successfully updated.')
-          end
-        end
-
-        context 'when user destroys the cluster' do
-          before do
-            page.accept_confirm do
-              click_link 'Remove integration'
-            end
-          end
-
-          it 'user sees creation form with the succeccful message' do
-            expect(page).to have_content('Cluster integration was successfully removed.')
-            expect(page).to have_link('Add cluster')
-          end
-        end
-      end
-    end
-  end
-
-  context 'when user has not signed in Google' do
->>>>>>> origin/list-multiple-clusters
     before do
       visit project_clusters_path(project)