Commit 1f4c2fcc authored by Stan Hu's avatar Stan Hu

Resolve conflicts in spec/models/environment_spec.rb

parent b7e3f3c3
......@@ -369,20 +369,14 @@ describe Environment do
end
describe '#deployment_platform' do
<<<<<<< HEAD
before do
stub_licensed_features(multiple_clusters: true)
end
context 'when there is a deployment platform for environment' do
let!(:cluster) do
create(:cluster, :provided_by_gcp, projects: [project])
=======
context 'when there is a deployment platform for environment' do
let!(:cluster) do
create(:cluster, :provided_by_gcp,
environment_scope: '*', projects: [project])
>>>>>>> upstream/master
end
it 'finds a deployment platform' do
......
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