Merge branch 'refactor-clusters' into 38464-k8s-apps

2 files changed, 5 insertions, 81 deletions

diff --git a/spec/controllers/projects/clusters_controller_spec.rb b/spec/controllers/projects/clusters_controller_spec.rb
index bfa5b5a91dc..de4cf40b492 100644
--- a/spec/controllers/projects/clusters_controller_spec.rb
+++ b/spec/controllers/projects/clusters_controller_spec.rb
@@ -200,51 +200,6 @@ describe Projects::ClustersController do
             expect(response).to redirect_to(project_cluster_path(project, project.cluster))
           end
         end
-
-        # TODO: Activate in 10.3
-        # context 'when adds a cluster manually' do
-        #   let(:params) do
-        #     {
-        #       cluster: {
-        #         name: 'new-cluster',
-        #         platform_type: :kubernetes,
-        #         provider_type: :user,
-        #         platform_kubernetes_attributes: {
-        #           namespace: 'custom-namespace',
-        #           api_url: 'https://111.111.111.111',
-        #           token: 'token'
-        #         }
-        #       }
-        #     }
-        #   end
-
-        #   it 'creates a new cluster' do
-        #     expect(ClusterProvisionWorker).to receive(:perform_async)
-        #     expect { go }.to change { Clusters::Cluster.count }
-        #     expect(response).to redirect_to(project_cluster_path(project, project.cluster))
-        #   end
-        # end
-
-        # TODO: We should fix this in 10.2
-        # Maybe
-        # - validates :provider_gcp, presence: true, if: :gcp?
-        # - validates :provider_type, presence: true
-        # are required in Clusters::Cluster
-        # context 'when not all required parameters are set' do
-        #   let(:params) do
-        #     {
-        #       cluster: {
-        #         name: 'new-cluster'
-        #       }
-        #     }
-        #   end
-
-        #   it 'shows an error message' do
-        #     expect { go }.not_to change { Clusters::Cluster.count }
-        #     expect(assigns(:cluster).errors).not_to be_empty
-        #     expect(response).to render_template(:new)
-        #   end
-        # end
       end
 
       context 'when access token is expired' do
@@ -397,42 +352,6 @@ describe Projects::ClustersController do
           end
         end
       end
-
-      # TODO: Activate in 10.3
-      # context 'when update namespace' do
-      #   let(:namespace) { 'namespace-123' }
-
-      #   let(:params) do
-      #     {
-      #       cluster: {
-      #         platform_kubernetes_attributes: {
-      #           namespace: namespace
-      #         }
-      #       }
-      #     }
-      #   end
-
-      #   it "updates and redirects back to show page" do
-      #     go
-
-      #     cluster.reload
-      #     expect(response).to redirect_to(project_cluster_path(project, project.cluster))
-      #     expect(flash[:notice]).to eq('Cluster was successfully updated.')
-      #     expect(cluster.platform.namespace).to eq(namespace)
-      #   end
-
-      #   context 'when namespace is invalid' do
-      #     let(:namespace) { 'my Namespace 321321321 #' }
-
-      #     it "rejects changes" do
-      #       go
-
-      #       expect(response).to have_gitlab_http_status(:ok)
-      #       expect(response).to render_template(:show)
-      #       expect(cluster.platform.namespace).not_to eq(namespace)
-      #     end
-      #   end
-      # end
     end
 
     describe 'security' do
diff --git a/spec/controllers/projects/notes_controller_spec.rb b/spec/controllers/projects/notes_controller_spec.rb
index 43afcc14957..5f5a789d5cc 100644
--- a/spec/controllers/projects/notes_controller_spec.rb
+++ b/spec/controllers/projects/notes_controller_spec.rb
@@ -59,6 +59,7 @@ describe Projects::NotesController do
         expect(note_json[:id]).to eq(note.id)
         expect(note_json[:discussion_html]).not_to be_nil
         expect(note_json[:diff_discussion_html]).to be_nil
+        expect(note_json[:discussion_line_code]).to be_nil
       end
     end
 
@@ -74,6 +75,7 @@ describe Projects::NotesController do
         expect(note_json[:id]).to eq(note.id)
         expect(note_json[:discussion_html]).not_to be_nil
         expect(note_json[:diff_discussion_html]).not_to be_nil
+        expect(note_json[:discussion_line_code]).not_to be_nil
       end
     end
 
@@ -92,6 +94,7 @@ describe Projects::NotesController do
           expect(note_json[:id]).to eq(note.id)
           expect(note_json[:discussion_html]).not_to be_nil
           expect(note_json[:diff_discussion_html]).to be_nil
+          expect(note_json[:discussion_line_code]).to be_nil
         end
       end
 
@@ -104,6 +107,7 @@ describe Projects::NotesController do
           expect(note_json[:id]).to eq(note.id)
           expect(note_json[:discussion_html]).to be_nil
           expect(note_json[:diff_discussion_html]).to be_nil
+          expect(note_json[:discussion_line_code]).to be_nil
         end
 
         context 'when user cannot read commit' do
@@ -133,6 +137,7 @@ describe Projects::NotesController do
         expect(note_json[:html]).not_to be_nil
         expect(note_json[:discussion_html]).to be_nil
         expect(note_json[:diff_discussion_html]).to be_nil
+        expect(note_json[:discussion_line_code]).to be_nil
       end
     end