diff options
author | GitLab Bot <gitlab-bot@gitlab.com> | 2020-09-19 04:45:44 +0300 |
---|---|---|
committer | GitLab Bot <gitlab-bot@gitlab.com> | 2020-09-19 04:45:44 +0300 |
commit | 85dc423f7090da0a52c73eb66faf22ddb20efff9 (patch) | |
tree | 9160f299afd8c80c038f08e1545be119f5e3f1e1 /spec/models/concerns | |
parent | 15c2c8c66dbe422588e5411eee7e68f1fa440bb8 (diff) |
Add latest changes from gitlab-org/gitlab@13-4-stable-ee
Diffstat (limited to 'spec/models/concerns')
-rw-r--r-- | spec/models/concerns/ci/artifactable_spec.rb | 36 | ||||
-rw-r--r-- | spec/models/concerns/from_except_spec.rb | 7 | ||||
-rw-r--r-- | spec/models/concerns/from_intersect_spec.rb | 7 | ||||
-rw-r--r-- | spec/models/concerns/from_set_operator_spec.rb | 20 | ||||
-rw-r--r-- | spec/models/concerns/from_union_spec.rb | 35 | ||||
-rw-r--r-- | spec/models/concerns/id_in_ordered_spec.rb | 33 | ||||
-rw-r--r-- | spec/models/concerns/issuable_spec.rb | 178 | ||||
-rw-r--r-- | spec/models/concerns/milestoneable_spec.rb | 8 | ||||
-rw-r--r-- | spec/models/concerns/prometheus_adapter_spec.rb | 10 |
9 files changed, 288 insertions, 46 deletions
diff --git a/spec/models/concerns/ci/artifactable_spec.rb b/spec/models/concerns/ci/artifactable_spec.rb index 13c2ff5efe5..f05189abdd2 100644 --- a/spec/models/concerns/ci/artifactable_spec.rb +++ b/spec/models/concerns/ci/artifactable_spec.rb @@ -18,4 +18,40 @@ RSpec.describe Ci::Artifactable do it { is_expected.to be_const_defined(:FILE_FORMAT_ADAPTERS) } end end + + describe '#each_blob' do + context 'when file format is gzip' do + context 'when gzip file contains one file' do + let(:artifact) { build(:ci_job_artifact, :junit) } + + it 'iterates blob once' do + expect { |b| artifact.each_blob(&b) }.to yield_control.once + end + end + + context 'when gzip file contains three files' do + let(:artifact) { build(:ci_job_artifact, :junit_with_three_testsuites) } + + it 'iterates blob three times' do + expect { |b| artifact.each_blob(&b) }.to yield_control.exactly(3).times + end + end + end + + context 'when file format is raw' do + let(:artifact) { build(:ci_job_artifact, :codequality, file_format: :raw) } + + it 'iterates blob once' do + expect { |b| artifact.each_blob(&b) }.to yield_control.once + end + end + + context 'when there are no adapters for the file format' do + let(:artifact) { build(:ci_job_artifact, :junit, file_format: :zip) } + + it 'raises an error' do + expect { |b| artifact.each_blob(&b) }.to raise_error(described_class::NotSupportedAdapterError) + end + end + end end diff --git a/spec/models/concerns/from_except_spec.rb b/spec/models/concerns/from_except_spec.rb new file mode 100644 index 00000000000..3b081b4f572 --- /dev/null +++ b/spec/models/concerns/from_except_spec.rb @@ -0,0 +1,7 @@ +# frozen_string_literal: true + +require 'spec_helper' + +RSpec.describe FromExcept do + it_behaves_like 'from set operator', Gitlab::SQL::Except +end diff --git a/spec/models/concerns/from_intersect_spec.rb b/spec/models/concerns/from_intersect_spec.rb new file mode 100644 index 00000000000..78884f8ae56 --- /dev/null +++ b/spec/models/concerns/from_intersect_spec.rb @@ -0,0 +1,7 @@ +# frozen_string_literal: true + +require 'spec_helper' + +RSpec.describe FromIntersect do + it_behaves_like 'from set operator', Gitlab::SQL::Intersect +end diff --git a/spec/models/concerns/from_set_operator_spec.rb b/spec/models/concerns/from_set_operator_spec.rb new file mode 100644 index 00000000000..8ebbb5550c9 --- /dev/null +++ b/spec/models/concerns/from_set_operator_spec.rb @@ -0,0 +1,20 @@ +# frozen_string_literal: true + +require 'spec_helper' + +RSpec.describe FromSetOperator do + describe 'when set operator method already exists' do + let(:redefine_method) do + Class.new do + def self.from_union + # This method intentionally left blank. + end + + extend FromSetOperator + define_set_operator Gitlab::SQL::Union + end + end + + it { expect { redefine_method }.to raise_exception(RuntimeError) } + end +end diff --git a/spec/models/concerns/from_union_spec.rb b/spec/models/concerns/from_union_spec.rb index 9819a6ec3de..bd2893090a8 100644 --- a/spec/models/concerns/from_union_spec.rb +++ b/spec/models/concerns/from_union_spec.rb @@ -3,38 +3,13 @@ require 'spec_helper' RSpec.describe FromUnion do - describe '.from_union' do - let(:model) do - Class.new(ActiveRecord::Base) do - self.table_name = 'users' - - include FromUnion + [true, false].each do |sql_set_operator| + context "when sql-set-operators feature flag is #{sql_set_operator}" do + before do + stub_feature_flags(sql_set_operators: sql_set_operator) end - end - - it 'selects from the results of the UNION' do - query = model.from_union([model.where(id: 1), model.where(id: 2)]) - - expect(query.to_sql).to match(/FROM \(\(SELECT.+\)\nUNION\n\(SELECT.+\)\) users/m) - end - - it 'supports the use of a custom alias for the sub query' do - query = model.from_union( - [model.where(id: 1), model.where(id: 2)], - alias_as: 'kittens' - ) - - expect(query.to_sql).to match(/FROM \(\(SELECT.+\)\nUNION\n\(SELECT.+\)\) kittens/m) - end - - it 'supports keeping duplicate rows' do - query = model.from_union( - [model.where(id: 1), model.where(id: 2)], - remove_duplicates: false - ) - expect(query.to_sql) - .to match(/FROM \(\(SELECT.+\)\nUNION ALL\n\(SELECT.+\)\) users/m) + it_behaves_like 'from set operator', Gitlab::SQL::Union end end end diff --git a/spec/models/concerns/id_in_ordered_spec.rb b/spec/models/concerns/id_in_ordered_spec.rb new file mode 100644 index 00000000000..a3b434caac6 --- /dev/null +++ b/spec/models/concerns/id_in_ordered_spec.rb @@ -0,0 +1,33 @@ +# frozen_string_literal: true + +require 'spec_helper' + +RSpec.describe IdInOrdered do + describe 'Issue' do + describe '.id_in_ordered' do + it 'returns issues matching the ids in the same order as the ids' do + issue1 = create(:issue) + issue2 = create(:issue) + issue3 = create(:issue) + issue4 = create(:issue) + issue5 = create(:issue) + + expect(Issue.id_in_ordered([issue3.id, issue1.id, issue4.id, issue5.id, issue2.id])).to eq([ + issue3, issue1, issue4, issue5, issue2 + ]) + end + + context 'when the ids are not an array of integers' do + it 'raises ArgumentError' do + expect { Issue.id_in_ordered([1, 'no SQL injection']) }.to raise_error(ArgumentError, "ids must be an array of integers") + end + end + + context 'when an empty array is given' do + it 'does not raise error' do + expect(Issue.id_in_ordered([]).to_a).to be_empty + end + end + end + end +end diff --git a/spec/models/concerns/issuable_spec.rb b/spec/models/concerns/issuable_spec.rb index 0824b5c7834..44561e2e55a 100644 --- a/spec/models/concerns/issuable_spec.rb +++ b/spec/models/concerns/issuable_spec.rb @@ -295,20 +295,14 @@ RSpec.describe Issuable do end describe "#new?" do - it "returns true when created today and record hasn't been updated" do - allow(issue).to receive(:today?).and_return(true) - expect(issue.new?).to be_truthy - end - - it "returns false when not created today" do - allow(issue).to receive(:today?).and_return(false) + it "returns false when created 30 hours ago" do + allow(issue).to receive(:created_at).and_return(Time.current - 30.hours) expect(issue.new?).to be_falsey end - it "returns false when record has been updated" do - allow(issue).to receive(:today?).and_return(true) - issue.update_attribute(:updated_at, 1.hour.ago) - expect(issue.new?).to be_falsey + it "returns true when created 20 hours ago" do + allow(issue).to receive(:created_at).and_return(Time.current - 20.hours) + expect(issue.new?).to be_truthy end end @@ -824,4 +818,166 @@ RSpec.describe Issuable do it_behaves_like 'matches_cross_reference_regex? fails fast' end end + + describe '#supports_time_tracking?' do + using RSpec::Parameterized::TableSyntax + + where(:issuable_type, :supports_time_tracking) do + :issue | true + :incident | false + :merge_request | true + end + + with_them do + let(:issuable) { build_stubbed(issuable_type) } + + subject { issuable.supports_time_tracking? } + + it { is_expected.to eq(supports_time_tracking) } + end + end + + describe '#supports_severity?' do + using RSpec::Parameterized::TableSyntax + + where(:issuable_type, :supports_severity) do + :issue | false + :incident | true + :merge_request | false + end + + with_them do + let(:issuable) { build_stubbed(issuable_type) } + + subject { issuable.supports_severity? } + + it { is_expected.to eq(supports_severity) } + end + end + + describe '#incident?' do + using RSpec::Parameterized::TableSyntax + + where(:issuable_type, :incident) do + :issue | false + :incident | true + :merge_request | false + end + + with_them do + let(:issuable) { build_stubbed(issuable_type) } + + subject { issuable.incident? } + + it { is_expected.to eq(incident) } + end + end + + describe '#supports_issue_type?' do + using RSpec::Parameterized::TableSyntax + + where(:issuable_type, :supports_issue_type) do + :issue | true + :merge_request | false + end + + with_them do + let(:issuable) { build_stubbed(issuable_type) } + + subject { issuable.supports_issue_type? } + + it { is_expected.to eq(supports_issue_type) } + end + end + + describe '#severity' do + subject { issuable.severity } + + context 'when issuable is not an incident' do + using RSpec::Parameterized::TableSyntax + + where(:issuable_type, :severity) do + :issue | 'unknown' + :merge_request | 'unknown' + end + + with_them do + let(:issuable) { build_stubbed(issuable_type) } + + it { is_expected.to eq(severity) } + end + end + + context 'when issuable type is an incident' do + let!(:issuable) { build_stubbed(:incident) } + + context 'when incident does not have issuable_severity' do + it 'returns default serverity' do + is_expected.to eq(IssuableSeverity::DEFAULT) + end + end + + context 'when incident has issuable_severity' do + let!(:issuable_severity) { build_stubbed(:issuable_severity, issue: issuable, severity: 'critical') } + + it 'returns issuable serverity' do + is_expected.to eq('critical') + end + end + end + end + + describe '#update_severity' do + let(:severity) { 'low' } + + subject(:update_severity) { issuable.update_severity(severity) } + + context 'when issuable not an incident' do + %i(issue merge_request).each do |issuable_type| + let(:issuable) { build_stubbed(issuable_type) } + + it { is_expected.to be_nil } + + it 'does not set severity' do + expect { subject }.not_to change(IssuableSeverity, :count) + end + end + end + + context 'when issuable is an incident' do + let!(:issuable) { create(:incident) } + + context 'when issuable does not have issuable severity yet' do + it 'creates new record' do + expect { update_severity }.to change { IssuableSeverity.where(issue: issuable).count }.to(1) + end + + it 'sets severity to specified value' do + expect { update_severity }.to change { issuable.severity }.to('low') + end + end + + context 'when issuable has an issuable severity' do + let!(:issuable_severity) { create(:issuable_severity, issue: issuable, severity: 'medium') } + + it 'does not create new record' do + expect { update_severity }.not_to change(IssuableSeverity, :count) + end + + it 'updates existing issuable severity' do + expect { update_severity }.to change { issuable_severity.severity }.to(severity) + end + end + + context 'when severity value is unsupported' do + let(:severity) { 'unsupported-severity' } + + it 'sets the severity to default value' do + update_severity + + expect(issuable.issuable_severity.severity).to eq(IssuableSeverity::DEFAULT) + end + end + end + end end diff --git a/spec/models/concerns/milestoneable_spec.rb b/spec/models/concerns/milestoneable_spec.rb index 3dd6f1450c7..f5b82e42ad4 100644 --- a/spec/models/concerns/milestoneable_spec.rb +++ b/spec/models/concerns/milestoneable_spec.rb @@ -100,6 +100,14 @@ RSpec.describe Milestoneable do expect(merge_request.supports_milestone?).to be_truthy end end + + context "for incidents" do + let(:incident) { build(:incident) } + + it 'returns false' do + expect(incident.supports_milestone?).to be_falsy + end + end end describe 'release scopes' do diff --git a/spec/models/concerns/prometheus_adapter_spec.rb b/spec/models/concerns/prometheus_adapter_spec.rb index e795e2b06cb..235e505c6e9 100644 --- a/spec/models/concerns/prometheus_adapter_spec.rb +++ b/spec/models/concerns/prometheus_adapter_spec.rb @@ -25,7 +25,7 @@ RSpec.describe PrometheusAdapter, :use_clean_rails_memory_store_caching do let(:validation_respone) { { data: { valid: true } } } around do |example| - Timecop.freeze { example.run } + freeze_time { example.run } end context 'with valid data' do @@ -45,7 +45,7 @@ RSpec.describe PrometheusAdapter, :use_clean_rails_memory_store_caching do let(:environment) { build_stubbed(:environment, slug: 'env-slug') } around do |example| - Timecop.freeze { example.run } + freeze_time { example.run } end context 'with valid data' do @@ -85,7 +85,7 @@ RSpec.describe PrometheusAdapter, :use_clean_rails_memory_store_caching do let(:deployment_query) { Gitlab::Prometheus::Queries::DeploymentQuery } around do |example| - Timecop.freeze { example.run } + freeze_time { example.run } end context 'with valid data' do @@ -107,7 +107,7 @@ RSpec.describe PrometheusAdapter, :use_clean_rails_memory_store_caching do let(:time_window) { [1552642245.067, 1552642095.831] } around do |example| - Timecop.freeze { example.run } + freeze_time { example.run } end context 'with valid data' do @@ -137,7 +137,7 @@ RSpec.describe PrometheusAdapter, :use_clean_rails_memory_store_caching do end around do |example| - Timecop.freeze { example.run } + freeze_time { example.run } end context 'when service is inactive' do |