diff options
| author | Annabel Dunstone Gray <annabel.dunstone@gmail.com> | 2017-01-24 12:50:22 -0600 |
|---|---|---|
| committer | Annabel Dunstone Gray <annabel.dunstone@gmail.com> | 2017-02-10 15:09:08 -0600 |
| commit | 465316ec22ba6083b5a6bf7dab21518564604c56 (patch) | |
| tree | c0c5e887e2d1f227cb04fa209167a719b660cece | |
| parent | bc6ad4f0fdbfedefcb7f439da4ca5ee5f0a4a416 (diff) | |
| download | gitlab-ce-465316ec22ba6083b5a6bf7dab21518564604c56.tar.gz | |
Fix failing conflicts test
| -rw-r--r-- | spec/features/merge_requests/conflicts_spec.rb | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/spec/features/merge_requests/conflicts_spec.rb b/spec/features/merge_requests/conflicts_spec.rb index 5bc4ab2dfe5..d710a780111 100644 --- a/spec/features/merge_requests/conflicts_spec.rb +++ b/spec/features/merge_requests/conflicts_spec.rb @@ -141,7 +141,7 @@ feature 'Merge request conflict resolution', js: true, feature: true do click_on 'Changes' wait_for_ajax - find('.click-to-expand').click + click_link 'Expand all' wait_for_ajax expect(page).to have_content('Gregor Samsa woke from troubled dreams') |