Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
G
gitlab-ce
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
0
Merge Requests
0
Analytics
Analytics
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Commits
Issue Boards
Open sidebar
Jérome Perrin
gitlab-ce
Commits
082b5954
Commit
082b5954
authored
Nov 02, 2017
by
Mike Greiling
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
explicitly add Accept: */* HTTP header back to test
parent
b2932eb5
Changes
1
Show whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
3 additions
and
1 deletion
+3
-1
spec/features/merge_requests/diffs_spec.rb
spec/features/merge_requests/diffs_spec.rb
+3
-1
No files found.
spec/features/merge_requests/diffs_spec.rb
View file @
082b5954
...
@@ -10,7 +10,9 @@ feature 'Diffs URL', :js do
...
@@ -10,7 +10,9 @@ feature 'Diffs URL', :js do
it
'renders the notes'
do
it
'renders the notes'
do
create
:note_on_merge_request
,
project:
project
,
noteable:
merge_request
,
note:
'Rebasing with master'
create
:note_on_merge_request
,
project:
project
,
noteable:
merge_request
,
note:
'Rebasing with master'
inspect_requests
(
inject_headers:
{
'Accept'
=>
'*/*'
})
do
visit
diffs_project_merge_request_path
(
project
,
merge_request
)
visit
diffs_project_merge_request_path
(
project
,
merge_request
)
end
# Load notes and diff through AJAX
# Load notes and diff through AJAX
expect
(
page
).
to
have_css
(
'.note-text'
,
visible:
false
,
text:
'Rebasing with master'
)
expect
(
page
).
to
have_css
(
'.note-text'
,
visible:
false
,
text:
'Rebasing with master'
)
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment