diff options
| author | Robert Speicher <robert@gitlab.com> | 2018-01-24 19:29:57 +0000 |
|---|---|---|
| committer | Robert Speicher <robert@gitlab.com> | 2018-01-24 19:29:57 +0000 |
| commit | f35bac576dd89a3fc8b601d0aef6e3f6d4888a09 (patch) | |
| tree | 6d4c9aa84d2dd82ac4558d63d6f2a5de9ee22b18 /spec/features | |
| parent | 8fe314e478e5767c6c351467a85c87ae30d043ea (diff) | |
| parent | 2fe57353ccc21ce7f513dbd6c8d630d49459c8c9 (diff) | |
| download | gitlab-ce-f35bac576dd89a3fc8b601d0aef6e3f6d4888a09.tar.gz | |
Merge branch '40744-idempotent-ids' into 'master'
Use the DatabaseCleaner 'deletion' strategy instead of 'truncation'
Closes #30783
See merge request gitlab-org/gitlab-ce!16516
Diffstat (limited to 'spec/features')
| -rw-r--r-- | spec/features/merge_request/user_resolves_diff_notes_and_discussions_resolve_spec.rb | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/spec/features/merge_request/user_resolves_diff_notes_and_discussions_resolve_spec.rb b/spec/features/merge_request/user_resolves_diff_notes_and_discussions_resolve_spec.rb index 590210d44ef..3e83a549682 100644 --- a/spec/features/merge_request/user_resolves_diff_notes_and_discussions_resolve_spec.rb +++ b/spec/features/merge_request/user_resolves_diff_notes_and_discussions_resolve_spec.rb @@ -108,7 +108,7 @@ describe 'Merge request > User resolves diff notes and discussions', :js do it 'shows resolved discussion when toggled' do find(".timeline-content .discussion[data-discussion-id='#{note.discussion_id}'] .discussion-toggle-button").click - expect(page.find(".timeline-content #note_#{note.noteable_id}")).to be_visible + expect(page.find(".timeline-content #note_#{note.id}")).to be_visible end end |