GitLab wurde aktualisiert. Dank regelmäßiger Updates bleibt das THM GitLab sicher und Sie profitieren von den neuesten Funktionen. Vielen Dank für Ihre Geduld.

Commit c48dbcf0 authored by Phil Hughes's avatar Phil Hughes
Browse files

Update spec/features/merge_request/user_resolves_conflicts_spec.rb

parent 42956f21
......@@ -37,6 +37,8 @@ def create_merge_request(source_branch)
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 }")
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment