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
1
Merge Requests
1
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
nexedi
gitlab-ce
Commits
c48dbcf0
Commit
c48dbcf0
authored
Feb 07, 2019
by
Phil Hughes
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Update spec/features/merge_request/user_resolves_conflicts_spec.rb
parent
42956f21
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
2 additions
and
0 deletions
+2
-0
spec/features/merge_request/user_resolves_conflicts_spec.rb
spec/features/merge_request/user_resolves_conflicts_spec.rb
+2
-0
No files found.
spec/features/merge_request/user_resolves_conflicts_spec.rb
View file @
c48dbcf0
...
...
@@ -37,6 +37,8 @@ describe 'Merge request > User resolves conflicts', :js do
click_on
'Changes'
wait_for_requests
find
(
'.js-toggle-tree-list'
).
click
within
find
(
'.diff-file'
,
text:
'files/ruby/popen.rb'
)
do
expect
(
page
).
to
have_selector
(
'.line_content.new'
,
text:
"vars = { 'PWD' => path }"
)
expect
(
page
).
to
have_selector
(
'.line_content.new'
,
text:
"options = { chdir: path }"
)
...
...
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