diff options
author | Sean McGivern <sean@mcgivern.me.uk> | 2017-04-24 13:56:43 +0000 |
---|---|---|
committer | Sean McGivern <sean@mcgivern.me.uk> | 2017-04-24 13:56:43 +0000 |
commit | 0df0c4c4af42d5d6e6ddf27ab59b72a36ef39fe6 (patch) | |
tree | 3d2305abcc8255634de92e7584a128bd77141853 /spec/features | |
parent | 65152cb3b8a3efeccdf1671f830e308128fd4f9f (diff) | |
parent | 1f3b410bcf639792b08c6d0c4a1b3499390b55ce (diff) | |
download | gitlab-ce-0df0c4c4af42d5d6e6ddf27ab59b72a36ef39fe6.tar.gz |
Merge branch 'dz-fix-spec-filenames-ce' into 'master'
Fix incorrect spec filenames which were ingored by CI
See merge request !10875
Diffstat (limited to 'spec/features')
-rw-r--r-- | spec/features/issues/create_issue_for_single_discussion_in_merge_request_spec.rb (renamed from spec/features/issues/create_issue_for_single_discussion_in_merge_request.rb) | 6 | ||||
-rw-r--r-- | spec/features/merge_requests/user_posts_notes_spec.rb (renamed from spec/features/merge_requests/user_posts_notes.rb) | 0 |
2 files changed, 3 insertions, 3 deletions
diff --git a/spec/features/issues/create_issue_for_single_discussion_in_merge_request.rb b/spec/features/issues/create_issue_for_single_discussion_in_merge_request_spec.rb index 88e2cc60d79..3a5a79e03f4 100644 --- a/spec/features/issues/create_issue_for_single_discussion_in_merge_request.rb +++ b/spec/features/issues/create_issue_for_single_discussion_in_merge_request_spec.rb @@ -4,7 +4,7 @@ feature 'Resolve an open discussion in a merge request by creating an issue', fe let(:user) { create(:user) } let(:project) { create(:project, only_allow_merge_if_all_discussions_are_resolved: true) } let(:merge_request) { create(:merge_request, source_project: project) } - let!(:discussion) { Discussion.for_diff_notes([create(:diff_note_on_merge_request, noteable: merge_request, project: project)]).first } + let!(:discussion) { create(:diff_note_on_merge_request, noteable: merge_request, project: project).to_discussion } describe 'As a user with access to the project' do before do @@ -74,8 +74,8 @@ feature 'Resolve an open discussion in a merge request by creating an issue', fe it 'Shows a notice to ask someone else to resolve the discussions' do expect(page).to have_content("The discussion at #{merge_request.to_reference}"\ - "(discussion #{discussion.first_note.id}) will stay unresolved."\ - "Ask someone with permission to resolve it.") + " (discussion #{discussion.first_note.id}) will stay unresolved."\ + " Ask someone with permission to resolve it.") end end end diff --git a/spec/features/merge_requests/user_posts_notes.rb b/spec/features/merge_requests/user_posts_notes_spec.rb index c7cc4d6bc72..c7cc4d6bc72 100644 --- a/spec/features/merge_requests/user_posts_notes.rb +++ b/spec/features/merge_requests/user_posts_notes_spec.rb |