diff options
| author | James Lopez <james@jameslopez.es> | 2016-07-11 18:00:19 +0200 |
|---|---|---|
| committer | James Lopez <james@jameslopez.es> | 2016-07-11 18:00:19 +0200 |
| commit | feecb4afde4cde116bcdca9c9c5059cf201720f8 (patch) | |
| tree | a71159a68d6a98731e21307849e82acbfb089f97 /spec/features/notes_on_merge_requests_spec.rb | |
| parent | 0e5f0276eae25c975078f825ea10ff2c8d05563c (diff) | |
| parent | 36c60b4c269a3d60f6b3e0df3bf1bfc7d44a6b54 (diff) | |
| download | gitlab-ce-feecb4afde4cde116bcdca9c9c5059cf201720f8.tar.gz | |
Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ce into fix/import-event-error
Diffstat (limited to 'spec/features/notes_on_merge_requests_spec.rb')
| -rw-r--r-- | spec/features/notes_on_merge_requests_spec.rb | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/spec/features/notes_on_merge_requests_spec.rb b/spec/features/notes_on_merge_requests_spec.rb index 737efcef45d..5174168713c 100644 --- a/spec/features/notes_on_merge_requests_spec.rb +++ b/spec/features/notes_on_merge_requests_spec.rb @@ -166,12 +166,14 @@ describe 'Comments', feature: true do click_diff_line is_expected. - to have_css("tr[id='#{line_code}'] + .js-temp-notes-holder form", + to have_css("form[data-line-code='#{line_code}']", count: 1) end it 'should be removed when canceled' do - page.within(".diff-file form[id$='#{line_code}-true']") do + is_expected.to have_css('.js-temp-notes-holder') + + page.within("form[data-line-code='#{line_code}']") do find('.js-close-discussion-note-form').trigger('click') end |