diff options
| author | GitLab Bot <gitlab-bot@gitlab.com> | 2021-03-12 19:26:10 +0300 |
|---|---|---|
| committer | GitLab Bot <gitlab-bot@gitlab.com> | 2021-03-12 19:26:10 +0300 |
| commit | 6653ccc011dec86e5140a5d09ea3b2357eab6714 (patch) | |
| tree | 897193f37bcd98152a0ac214f80a3c4cfe1047c5 /spec/lib/gitlab/diff/inline_diff_spec.rb | |
| parent | bff35a05aed6a31380a73c39113808fd262c2c37 (diff) | |
Add latest changes from gitlab-org/gitlab@13-10-stable-eev13.10.0-rc41
Diffstat (limited to 'spec/lib/gitlab/diff/inline_diff_spec.rb')
| -rw-r--r-- | spec/lib/gitlab/diff/inline_diff_spec.rb | 11 |
1 files changed, 0 insertions, 11 deletions
diff --git a/spec/lib/gitlab/diff/inline_diff_spec.rb b/spec/lib/gitlab/diff/inline_diff_spec.rb index dce655d5690..714b5d813c4 100644 --- a/spec/lib/gitlab/diff/inline_diff_spec.rb +++ b/spec/lib/gitlab/diff/inline_diff_spec.rb @@ -52,17 +52,6 @@ RSpec.describe Gitlab::Diff::InlineDiff do expect(subject[0]).to eq([3..6]) expect(subject[1]).to eq([3..3, 17..22]) end - - context 'when feature flag is disabled' do - before do - stub_feature_flags(improved_merge_diff_highlighting: false) - end - - it 'finds all inline diffs' do - expect(subject[0]).to eq([3..19]) - expect(subject[1]).to eq([3..22]) - end - end end end |