Fixes create service spec

a6f3f494 · Mayra Cabrera · a0581ed5 · a6f3f494
Commit a6f3f494 authored Mar 27, 2018 by Mayra Cabrera
Hide whitespace changes
Inline Side-by-side

Showing with 1 addition and 3 deletions

spec/services/clusters/create_service_spec.rb spec/services/clusters/create_service_spec.rb +1 -3

No files found.
--- a/spec/services/clusters/create_service_spec.rb
+++ b/spec/services/clusters/create_service_spec.rb
@@ -81,10 +81,8 @@ describe Clusters::CreateService do
    end

    context 'when project has a cluster' do
-<<<<<<< HEAD
-=======
      include_context 'valid params'
->>>>>>> upstream/master
+
      let!(:cluster) { create(:cluster, :provided_by_gcp, :production_environment, projects: [project]) }

      before do