diff options
Diffstat (limited to 'spec/models')
-rw-r--r-- | spec/models/analytics/cycle_analytics/project_stage_spec.rb | 6 | ||||
-rw-r--r-- | spec/models/clusters/cluster_spec.rb | 28 | ||||
-rw-r--r-- | spec/models/error_tracking/project_error_tracking_setting_spec.rb | 2 | ||||
-rw-r--r-- | spec/models/merge_request_spec.rb | 2 | ||||
-rw-r--r-- | spec/models/service_spec.rb | 8 |
5 files changed, 20 insertions, 26 deletions
diff --git a/spec/models/analytics/cycle_analytics/project_stage_spec.rb b/spec/models/analytics/cycle_analytics/project_stage_spec.rb index 9d18618f638..9850bfde30e 100644 --- a/spec/models/analytics/cycle_analytics/project_stage_spec.rb +++ b/spec/models/analytics/cycle_analytics/project_stage_spec.rb @@ -8,7 +8,7 @@ describe Analytics::CycleAnalytics::ProjectStage do end it 'default stages must be valid' do - project = create(:project) + project = build(:project) Gitlab::Analytics::CycleAnalytics::DefaultStages.all.each do |params| stage = described_class.new(params.merge(project: project)) @@ -17,13 +17,13 @@ describe Analytics::CycleAnalytics::ProjectStage do end it_behaves_like 'cycle analytics stage' do - let(:parent) { create(:project) } + let(:parent) { build(:project) } let(:parent_name) { :project } end context 'relative positioning' do it_behaves_like 'a class that supports relative positioning' do - let(:project) { create(:project) } + let(:project) { build(:project) } let(:factory) { :cycle_analytics_project_stage } let(:default_params) { { project: project } } end diff --git a/spec/models/clusters/cluster_spec.rb b/spec/models/clusters/cluster_spec.rb index 8d0ede3d9bd..f6c19ccc9d3 100644 --- a/spec/models/clusters/cluster_spec.rb +++ b/spec/models/clusters/cluster_spec.rb @@ -573,17 +573,17 @@ describe Clusters::Cluster, :use_clean_rails_memory_store_caching do end describe '#allow_user_defined_namespace?' do - let(:cluster) { create(:cluster, :provided_by_gcp) } - subject { cluster.allow_user_defined_namespace? } context 'project type cluster' do context 'gitlab managed' do + let(:cluster) { build(:cluster, :provided_by_gcp) } + it { is_expected.to be_truthy } end context 'not managed' do - let(:cluster) { create(:cluster, :provided_by_gcp, managed: false) } + let(:cluster) { build(:cluster, :provided_by_gcp, managed: false) } it { is_expected.to be_truthy } end @@ -591,13 +591,13 @@ describe Clusters::Cluster, :use_clean_rails_memory_store_caching do context 'group type cluster' do context 'gitlab managed' do - let(:cluster) { create(:cluster, :provided_by_gcp, :group) } + let(:cluster) { build(:cluster, :provided_by_gcp, :group) } it { is_expected.to be_falsey } end context 'not managed' do - let(:cluster) { create(:cluster, :provided_by_gcp, :group, managed: false) } + let(:cluster) { build(:cluster, :provided_by_gcp, :group, managed: false) } it { is_expected.to be_truthy } end @@ -605,13 +605,13 @@ describe Clusters::Cluster, :use_clean_rails_memory_store_caching do context 'instance type cluster' do context 'gitlab managed' do - let(:cluster) { create(:cluster, :provided_by_gcp, :instance) } + let(:cluster) { build(:cluster, :provided_by_gcp, :instance) } it { is_expected.to be_falsey } end context 'not managed' do - let(:cluster) { create(:cluster, :provided_by_gcp, :instance, managed: false) } + let(:cluster) { build(:cluster, :provided_by_gcp, :instance, managed: false) } it { is_expected.to be_truthy } end @@ -649,18 +649,18 @@ describe Clusters::Cluster, :use_clean_rails_memory_store_caching do end describe '#kube_ingress_domain' do - let(:cluster) { create(:cluster, :provided_by_gcp) } + let(:cluster) { build(:cluster, :provided_by_gcp) } subject { cluster.kube_ingress_domain } context 'with domain set in cluster' do - let(:cluster) { create(:cluster, :provided_by_gcp, :with_domain) } + let(:cluster) { build(:cluster, :provided_by_gcp, :with_domain) } it { is_expected.to eq(cluster.domain) } end context 'with no domain on cluster' do - let(:cluster) { create(:cluster, :project, :provided_by_gcp) } + let(:cluster) { build(:cluster, :project, :provided_by_gcp) } let(:project) { cluster.project } context 'with domain set at instance level' do @@ -754,7 +754,7 @@ describe Clusters::Cluster, :use_clean_rails_memory_store_caching do end context 'with no domain' do - let(:cluster) { create(:cluster, :provided_by_gcp, :project) } + let(:cluster) { build(:cluster, :provided_by_gcp, :project) } it 'returns an empty array' do expect(subject.to_hash).to be_empty @@ -782,7 +782,7 @@ describe Clusters::Cluster, :use_clean_rails_memory_store_caching do subject { cluster.status_name } context 'the cluster has a provider' do - let(:cluster) { create(:cluster, :provided_by_gcp) } + let(:cluster) { build(:cluster, :provided_by_gcp) } let(:provider_status) { :errored } before do @@ -816,7 +816,7 @@ describe Clusters::Cluster, :use_clean_rails_memory_store_caching do end context 'there is a cached connection status' do - let(:cluster) { create(:cluster, :provided_by_user) } + let(:cluster) { build(:cluster, :provided_by_user) } before do allow(cluster).to receive(:connection_status).and_return(:connected) @@ -826,7 +826,7 @@ describe Clusters::Cluster, :use_clean_rails_memory_store_caching do end context 'there is no connection status in the cache' do - let(:cluster) { create(:cluster, :provided_by_user) } + let(:cluster) { build(:cluster, :provided_by_user) } before do allow(cluster).to receive(:connection_status).and_return(nil) diff --git a/spec/models/error_tracking/project_error_tracking_setting_spec.rb b/spec/models/error_tracking/project_error_tracking_setting_spec.rb index ef3679da71f..b564c48a9c1 100644 --- a/spec/models/error_tracking/project_error_tracking_setting_spec.rb +++ b/spec/models/error_tracking/project_error_tracking_setting_spec.rb @@ -8,7 +8,7 @@ describe ErrorTracking::ProjectErrorTrackingSetting do let_it_be(:project) { create(:project) } - subject(:setting) { create(:project_error_tracking_setting, project: project) } + subject(:setting) { build(:project_error_tracking_setting, project: project) } describe 'Associations' do it { is_expected.to belong_to(:project) } diff --git a/spec/models/merge_request_spec.rb b/spec/models/merge_request_spec.rb index 14f50ffd689..7cadce12213 100644 --- a/spec/models/merge_request_spec.rb +++ b/spec/models/merge_request_spec.rb @@ -276,6 +276,8 @@ describe MergeRequest do end describe 'respond to' do + subject { build(:merge_request) } + it { is_expected.to respond_to(:unchecked?) } it { is_expected.to respond_to(:checking?) } it { is_expected.to respond_to(:can_be_merged?) } diff --git a/spec/models/service_spec.rb b/spec/models/service_spec.rb index 7e0c491bdfa..2bc8bdaed7c 100644 --- a/spec/models/service_spec.rb +++ b/spec/models/service_spec.rb @@ -406,14 +406,6 @@ describe Service do end end - describe '.find_by_template' do - let!(:service) { create(:service, template: true) } - - it 'returns service template' do - expect(described_class.find_by_template).to eq(service) - end - end - describe '#api_field_names' do let(:fake_service) do Class.new(Service) do |