diff options
author | GitLab Bot <gitlab-bot@gitlab.com> | 2021-11-11 15:10:41 +0300 |
---|---|---|
committer | GitLab Bot <gitlab-bot@gitlab.com> | 2021-11-11 15:10:41 +0300 |
commit | 1c7411c597334e20d2e92cc948f0699d339d2710 (patch) | |
tree | e88e76f1f563b71a4b9113373f24849bc5d1d79e /spec/lib | |
parent | 3e9023894d319cf56b7b844910953df19ca010b1 (diff) |
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'spec/lib')
-rw-r--r-- | spec/lib/gitlab/ci/variables/collection_spec.rb | 4 | ||||
-rw-r--r-- | spec/lib/gitlab/diff/position_tracer/line_strategy_spec.rb | 7 |
2 files changed, 6 insertions, 5 deletions
diff --git a/spec/lib/gitlab/ci/variables/collection_spec.rb b/spec/lib/gitlab/ci/variables/collection_spec.rb index 6e3ed27bb44..26c560565e0 100644 --- a/spec/lib/gitlab/ci/variables/collection_spec.rb +++ b/spec/lib/gitlab/ci/variables/collection_spec.rb @@ -358,8 +358,6 @@ RSpec.describe Gitlab::Ci::Variables::Collection do end describe '#sort_and_expand_all' do - let_it_be(:project) { create(:project) } - context 'table tests' do using RSpec::Parameterized::TableSyntax @@ -550,7 +548,7 @@ RSpec.describe Gitlab::Ci::Variables::Collection do with_them do let(:collection) { Gitlab::Ci::Variables::Collection.new(variables) } - subject { collection.sort_and_expand_all(project, keep_undefined: keep_undefined) } + subject { collection.sort_and_expand_all(keep_undefined: keep_undefined) } it 'returns Collection' do is_expected.to be_an_instance_of(Gitlab::Ci::Variables::Collection) diff --git a/spec/lib/gitlab/diff/position_tracer/line_strategy_spec.rb b/spec/lib/gitlab/diff/position_tracer/line_strategy_spec.rb index bdeaabec1f1..b646cf38178 100644 --- a/spec/lib/gitlab/diff/position_tracer/line_strategy_spec.rb +++ b/spec/lib/gitlab/diff/position_tracer/line_strategy_spec.rb @@ -581,13 +581,16 @@ RSpec.describe Gitlab::Diff::PositionTracer::LineStrategy, :clean_gitlab_redis_c ) end - it "returns the new position but drops line_range information" do + it "returns the new position" do expect_change_position( old_path: file_name, new_path: file_name, old_line: nil, new_line: 2, - line_range: nil + line_range: { + "start_line_code" => 1, + "end_line_code" => 2 + } ) end end |