summaryrefslogtreecommitdiff
path: root/spec/features/merge_requests
diff options
context:
space:
mode:
authorPhil Hughes <me@iamphill.com>2017-08-30 14:40:07 +0100
committerPhil Hughes <me@iamphill.com>2017-08-30 14:40:07 +0100
commit25a3b7fab905d09f6f064108f457a4e20c8915ff (patch)
tree52ba272a0a36fcb4a0d59b29a2842b6befed8129 /spec/features/merge_requests
parentaab5d55090a55caebf9c3c4a52ae92036713e8ae (diff)
downloadgitlab-ce-25a3b7fab905d09f6f064108f457a4e20c8915ff.tar.gz
more navigation spec fixes
Diffstat (limited to 'spec/features/merge_requests')
-rw-r--r--spec/features/merge_requests/user_posts_diff_notes_spec.rb4
1 files changed, 2 insertions, 2 deletions
diff --git a/spec/features/merge_requests/user_posts_diff_notes_spec.rb b/spec/features/merge_requests/user_posts_diff_notes_spec.rb
index 162b9ccc1ff..877f305120e 100644
--- a/spec/features/merge_requests/user_posts_diff_notes_spec.rb
+++ b/spec/features/merge_requests/user_posts_diff_notes_spec.rb
@@ -6,6 +6,8 @@ feature 'Merge requests > User posts diff notes', :js do
let(:project) { merge_request.source_project }
before do
+ allow_any_instance_of(ApplicationHelper).to receive(:collapsed_sidebar?).and_return(true)
+
project.add_developer(user)
sign_in(user)
end
@@ -17,8 +19,6 @@ feature 'Merge requests > User posts diff notes', :js do
context 'when hovering over a parallel view diff file' do
before do
- allow_any_instance_of(ApplicationHelper).to receive(:collapsed_sidebar?).and_return(true)
-
visit diffs_project_merge_request_path(project, merge_request, view: 'parallel')
end