summaryrefslogtreecommitdiff
path: root/spec/views
diff options
context:
space:
mode:
authorGitLab Bot <gitlab-bot@gitlab.com>2020-06-05 12:08:24 +0000
committerGitLab Bot <gitlab-bot@gitlab.com>2020-06-05 12:08:24 +0000
commit38b39c50473ba58a80ddad5c22c96ccd5128ddfb (patch)
tree21a3dc9f9ab12f079f4f791f40ba175b872394ef /spec/views
parent963838b90c1c121d16ec43353a4e0d44450664cf (diff)
downloadgitlab-ce-38b39c50473ba58a80ddad5c22c96ccd5128ddfb.tar.gz
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'spec/views')
-rw-r--r--spec/views/projects/merge_requests/show.html.haml_spec.rb4
1 files changed, 4 insertions, 0 deletions
diff --git a/spec/views/projects/merge_requests/show.html.haml_spec.rb b/spec/views/projects/merge_requests/show.html.haml_spec.rb
index 665003d137a..e0acf5d1507 100644
--- a/spec/views/projects/merge_requests/show.html.haml_spec.rb
+++ b/spec/views/projects/merge_requests/show.html.haml_spec.rb
@@ -3,6 +3,10 @@
require 'spec_helper'
describe 'projects/merge_requests/show.html.haml' do
+ before do
+ allow(view).to receive(:experiment_enabled?).and_return(false)
+ end
+
include_context 'merge request show action'
describe 'merge request assignee sidebar' do