diff options
author | Robert Speicher <rspeicher@gmail.com> | 2019-08-01 16:51:11 +0000 |
---|---|---|
committer | Robert Speicher <rspeicher@gmail.com> | 2019-08-01 16:51:11 +0000 |
commit | 5b38fced90e81241b4266bac78c8e53a432f5144 (patch) | |
tree | 8f8d616437cf15a2c7bc31e6e0ea800a394aff4a /spec/support/shared_examples | |
parent | ae96486b0dc19010f765ddd031bb8d28cdb53974 (diff) | |
parent | e3dd1adafa4d2bc27081184ed98f961a08c38268 (diff) | |
download | gitlab-ce-5b38fced90e81241b4266bac78c8e53a432f5144.tar.gz |
Merge branch 'bvl-fix-relative-positioning-rename-ce' into 'master'
Skip specs for default relative positions
See merge request gitlab-org/gitlab-ce!31390
Diffstat (limited to 'spec/support/shared_examples')
-rw-r--r-- | spec/support/shared_examples/relative_positioning_shared_examples.rb | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/spec/support/shared_examples/relative_positioning_shared_examples.rb b/spec/support/shared_examples/relative_positioning_shared_examples.rb index 45eacf3721e..1c53e2602eb 100644 --- a/spec/support/shared_examples/relative_positioning_shared_examples.rb +++ b/spec/support/shared_examples/relative_positioning_shared_examples.rb @@ -1,6 +1,6 @@ # frozen_string_literal: true -RSpec.shared_examples "a class that supports relative positioning" do +RSpec.shared_examples 'a class that supports relative positioning' do let(:item1) { create(factory, default_params) } let(:item2) { create(factory, default_params) } let(:new_item) { create(factory, default_params) } @@ -11,6 +11,9 @@ RSpec.shared_examples "a class that supports relative positioning" do describe '.move_nulls_to_end' do it 'moves items with null relative_position to the end' do + skip("#{item1} has a default relative position") if item1.relative_position + skip("#{item2} has a default relative position") if item2.relative_position + described_class.move_nulls_to_end([item1, item2]) expect(item2.prev_relative_position).to eq item1.relative_position @@ -19,6 +22,8 @@ RSpec.shared_examples "a class that supports relative positioning" do end it 'moves the item near the start position when there are no existing positions' do + skip("#{item1} has a default relative position") if item1.relative_position + described_class.move_nulls_to_end([item1]) expect(item1.relative_position).to eq(described_class::START_POSITION + described_class::IDEAL_DISTANCE) |