diff options
Diffstat (limited to 'spec/lib/gitlab/utils')
-rw-r--r-- | spec/lib/gitlab/utils/deep_size_spec.rb | 8 | ||||
-rw-r--r-- | spec/lib/gitlab/utils/delegator_override_spec.rb | 1 | ||||
-rw-r--r-- | spec/lib/gitlab/utils/execution_tracker_spec.rb | 24 | ||||
-rw-r--r-- | spec/lib/gitlab/utils/json_size_estimator_spec.rb | 2 | ||||
-rw-r--r-- | spec/lib/gitlab/utils/markdown_spec.rb | 2 | ||||
-rw-r--r-- | spec/lib/gitlab/utils/merge_hash_spec.rb | 2 | ||||
-rw-r--r-- | spec/lib/gitlab/utils/nokogiri_spec.rb | 3 | ||||
-rw-r--r-- | spec/lib/gitlab/utils/sanitize_node_link_spec.rb | 4 |
8 files changed, 34 insertions, 12 deletions
diff --git a/spec/lib/gitlab/utils/deep_size_spec.rb b/spec/lib/gitlab/utils/deep_size_spec.rb index 7595fb2c1b0..6b0be4590f1 100644 --- a/spec/lib/gitlab/utils/deep_size_spec.rb +++ b/spec/lib/gitlab/utils/deep_size_spec.rb @@ -1,6 +1,6 @@ # frozen_string_literal: true -require 'spec_helper' +require 'fast_spec_helper' RSpec.describe Gitlab::Utils::DeepSize do let(:data) do @@ -58,10 +58,4 @@ RSpec.describe Gitlab::Utils::DeepSize do it { is_expected.not_to be_valid } end end - - describe '.human_default_max_size' do - it 'returns 1 MB' do - expect(described_class.human_default_max_size).to eq('1 MB') - end - end end diff --git a/spec/lib/gitlab/utils/delegator_override_spec.rb b/spec/lib/gitlab/utils/delegator_override_spec.rb index af4c7fa5d8e..2dafa75e344 100644 --- a/spec/lib/gitlab/utils/delegator_override_spec.rb +++ b/spec/lib/gitlab/utils/delegator_override_spec.rb @@ -31,6 +31,7 @@ RSpec.describe Gitlab::Utils::DelegatorOverride do before do stub_env('STATIC_VERIFICATION', 'true') + described_class.validators.clear end describe '.delegator_target' do diff --git a/spec/lib/gitlab/utils/execution_tracker_spec.rb b/spec/lib/gitlab/utils/execution_tracker_spec.rb new file mode 100644 index 00000000000..6c42863658c --- /dev/null +++ b/spec/lib/gitlab/utils/execution_tracker_spec.rb @@ -0,0 +1,24 @@ +# frozen_string_literal: true + +require 'fast_spec_helper' + +RSpec.describe Gitlab::Utils::ExecutionTracker do + subject(:tracker) { described_class.new } + + describe '#over_limit?' do + it 'is true when max runtime is exceeded' do + monotonic_time_before = 1 # this will be the start time + monotonic_time_after = described_class::MAX_RUNTIME.to_i + 1 # this will be returned when over_limit? is called + + allow(Gitlab::Metrics::System).to receive(:monotonic_time).and_return(monotonic_time_before, monotonic_time_after) + + tracker + + expect(tracker).to be_over_limit + end + + it 'is false when max runtime is not exceeded' do + expect(tracker).not_to be_over_limit + end + end +end diff --git a/spec/lib/gitlab/utils/json_size_estimator_spec.rb b/spec/lib/gitlab/utils/json_size_estimator_spec.rb index 5fd66caa5e9..ba49cc3a847 100644 --- a/spec/lib/gitlab/utils/json_size_estimator_spec.rb +++ b/spec/lib/gitlab/utils/json_size_estimator_spec.rb @@ -1,6 +1,6 @@ # frozen_string_literal: true -require 'spec_helper' +require 'fast_spec_helper' RSpec.describe Gitlab::Utils::JsonSizeEstimator do RSpec::Matchers.define :match_json_bytesize_of do |expected| diff --git a/spec/lib/gitlab/utils/markdown_spec.rb b/spec/lib/gitlab/utils/markdown_spec.rb index acc5bd47c8c..0a7d1160bbc 100644 --- a/spec/lib/gitlab/utils/markdown_spec.rb +++ b/spec/lib/gitlab/utils/markdown_spec.rb @@ -1,6 +1,6 @@ # frozen_string_literal: true -require 'spec_helper' +require 'fast_spec_helper' RSpec.describe Gitlab::Utils::Markdown do let(:klass) do diff --git a/spec/lib/gitlab/utils/merge_hash_spec.rb b/spec/lib/gitlab/utils/merge_hash_spec.rb index 11daa05c9ee..4eec6e83be2 100644 --- a/spec/lib/gitlab/utils/merge_hash_spec.rb +++ b/spec/lib/gitlab/utils/merge_hash_spec.rb @@ -1,6 +1,6 @@ # frozen_string_literal: true -require 'spec_helper' +require 'fast_spec_helper' RSpec.describe Gitlab::Utils::MergeHash do describe '.crush' do it 'can flatten a hash to each element' do diff --git a/spec/lib/gitlab/utils/nokogiri_spec.rb b/spec/lib/gitlab/utils/nokogiri_spec.rb index 90f137f53c8..7b4c63f9168 100644 --- a/spec/lib/gitlab/utils/nokogiri_spec.rb +++ b/spec/lib/gitlab/utils/nokogiri_spec.rb @@ -1,6 +1,7 @@ # frozen_string_literal: true -require 'spec_helper' +require 'fast_spec_helper' +require 'rspec-parameterized' RSpec.describe Gitlab::Utils::Nokogiri do describe '#css_to_xpath' do diff --git a/spec/lib/gitlab/utils/sanitize_node_link_spec.rb b/spec/lib/gitlab/utils/sanitize_node_link_spec.rb index 3ab592dfc62..1fc10bc3aa8 100644 --- a/spec/lib/gitlab/utils/sanitize_node_link_spec.rb +++ b/spec/lib/gitlab/utils/sanitize_node_link_spec.rb @@ -1,6 +1,8 @@ # frozen_string_literal: true -require 'spec_helper' +require 'fast_spec_helper' +require 'html/pipeline' +require 'addressable' RSpec.describe Gitlab::Utils::SanitizeNodeLink do let(:klass) do |