diff options
| author | Douwe Maan <douwe@selenight.nl> | 2017-08-17 14:01:31 +0200 |
|---|---|---|
| committer | Douwe Maan <douwe@selenight.nl> | 2017-08-17 14:01:31 +0200 |
| commit | 834f1b30d50dc3ad9d0f6ff81cef24dc6ebc375c (patch) | |
| tree | e5f2e714e695d995649942111f29d4e857b33a67 /features/steps/project | |
| parent | 6aeb99c98bee304c5010a1173c47777eff1e04a5 (diff) | |
| parent | fe0ffcc78941bf9de98e3698e743c3cbb9846b6a (diff) | |
| download | gitlab-ce-834f1b30d50dc3ad9d0f6ff81cef24dc6ebc375c.tar.gz | |
Merge branch 'master' into issue-discussions-refactor
# Conflicts:
# package.json
# spec/support/features/reportable_note_shared_examples.rb
Diffstat (limited to 'features/steps/project')
| -rw-r--r-- | features/steps/project/merge_requests.rb | 3 |
1 files changed, 0 insertions, 3 deletions
diff --git a/features/steps/project/merge_requests.rb b/features/steps/project/merge_requests.rb index 810cd75591b..7254fbc2e4e 100644 --- a/features/steps/project/merge_requests.rb +++ b/features/steps/project/merge_requests.rb @@ -299,9 +299,6 @@ class Spinach::Features::ProjectMergeRequests < Spinach::FeatureSteps step 'I change the comment "Line is wrong" to "Typo, please fix" on diff' do page.within('.diff-file:nth-of-type(5) .note') do - find('.more-actions').click - find('.more-actions .dropdown-menu li', match: :first) - find('.js-note-edit').click page.within('.current-note-edit-form', visible: true) do |