Commit 4dfa6409 authored by Shinya Maeda's avatar Shinya Maeda

Use sequence to reduce change lines

parent fb281d22
...@@ -4,7 +4,7 @@ describe Projects::ClustersController do ...@@ -4,7 +4,7 @@ describe Projects::ClustersController do
include AccessMatchersForController include AccessMatchersForController
include GoogleApi::CloudPlatformHelpers include GoogleApi::CloudPlatformHelpers
let(:project) { create(:project) } set(:project) { create(:project) }
describe 'GET index' do describe 'GET index' do
describe 'functionality' do describe 'functionality' do
...@@ -18,7 +18,7 @@ describe Projects::ClustersController do ...@@ -18,7 +18,7 @@ describe Projects::ClustersController do
context 'when project has one or more clusters' do context 'when project has one or more clusters' do
let(:project) { create(:project) } let(:project) { create(:project) }
let!(:enabled_cluster) { create(:cluster, :provided_by_gcp, projects: [project]) } let!(:enabled_cluster) { create(:cluster, :provided_by_gcp, projects: [project]) }
let!(:disabled_cluster) { create(:cluster, :disabled, :provided_by_gcp, environment_scope: 'prod/*', projects: [project]) } let!(:disabled_cluster) { create(:cluster, :disabled, :provided_by_gcp, projects: [project]) }
it 'lists available clusters' do it 'lists available clusters' do
go go
...@@ -32,8 +32,7 @@ describe Projects::ClustersController do ...@@ -32,8 +32,7 @@ describe Projects::ClustersController do
before do before do
allow(Clusters::Cluster).to receive(:paginates_per).and_return(1) allow(Clusters::Cluster).to receive(:paginates_per).and_return(1)
create(:cluster, :provided_by_gcp, environment_scope: 'staging/*', projects: [project]) create_list(:cluster, 2, :provided_by_gcp, projects: [project])
create(:cluster, :provided_by_gcp, environment_scope: 'review/*', projects: [project])
get :index, namespace_id: project.namespace, project_id: project, page: last_page get :index, namespace_id: project.namespace, project_id: project, page: last_page
end end
...@@ -287,7 +286,7 @@ describe Projects::ClustersController do ...@@ -287,7 +286,7 @@ describe Projects::ClustersController do
end end
describe 'security' do describe 'security' do
let(:cluster) { create(:cluster, :provided_by_gcp, projects: [project]) } set(:cluster) { create(:cluster, :provided_by_gcp, projects: [project]) }
let(:params) do let(:params) do
{ cluster: { enabled: false } } { cluster: { enabled: false } }
...@@ -371,7 +370,7 @@ describe Projects::ClustersController do ...@@ -371,7 +370,7 @@ describe Projects::ClustersController do
end end
describe 'security' do describe 'security' do
let(:cluster) { create(:cluster, :provided_by_gcp, environment_scope: 'prod/*', projects: [project]) } set(:cluster) { create(:cluster, :provided_by_gcp, projects: [project]) }
it { expect { go }.to be_allowed_for(:admin) } it { expect { go }.to be_allowed_for(:admin) }
it { expect { go }.to be_allowed_for(:owner).of(project) } it { expect { go }.to be_allowed_for(:owner).of(project) }
......
...@@ -2,6 +2,7 @@ FactoryBot.define do ...@@ -2,6 +2,7 @@ FactoryBot.define do
factory :cluster, class: Clusters::Cluster do factory :cluster, class: Clusters::Cluster do
user user
name 'test-cluster' name 'test-cluster'
sequence(:environment_scope) { |n| "production#{n}/*" }
trait :project do trait :project do
before(:create) do |cluster, evaluator| before(:create) do |cluster, evaluator|
......
...@@ -6,7 +6,7 @@ describe ClustersFinder do ...@@ -6,7 +6,7 @@ describe ClustersFinder do
describe '#execute' do describe '#execute' do
let(:enabled_cluster) { create(:cluster, :provided_by_gcp, projects: [project]) } let(:enabled_cluster) { create(:cluster, :provided_by_gcp, projects: [project]) }
let(:disabled_cluster) { create(:cluster, :disabled, :provided_by_gcp, environment_scope: 'prod/*', projects: [project]) } let(:disabled_cluster) { create(:cluster, :disabled, :provided_by_gcp, projects: [project]) }
subject { described_class.new(project, user, scope).execute } subject { described_class.new(project, user, scope).execute }
......
...@@ -81,7 +81,7 @@ describe Clusters::CreateService do ...@@ -81,7 +81,7 @@ describe Clusters::CreateService do
end end
context 'when project has a cluster' do context 'when project has a cluster' do
let!(:cluster) { create(:cluster, :provided_by_gcp, environment_scope: 'prod/*', projects: [project]) } let!(:cluster) { create(:cluster, :provided_by_gcp, projects: [project]) }
before do before do
allow(project).to receive(:feature_available?).and_call_original allow(project).to receive(:feature_available?).and_call_original
......
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