diff options
| author | Felipe Artur <felipefac@gmail.com> | 2019-01-14 17:20:11 -0200 |
|---|---|---|
| committer | Felipe Artur <felipefac@gmail.com> | 2019-01-14 17:20:11 -0200 |
| commit | d99d6494f9979ed084d7d200ae02e5ee0eb2760a (patch) | |
| tree | 25b206318833bd7e71575fecbc1641b0d1453231 /spec/controllers | |
| parent | 8fecf976cdf693cec2b032d243c333c5465c8a12 (diff) | |
| download | gitlab-ce-d99d6494f9979ed084d7d200ae02e5ee0eb2760a.tar.gz | |
[EE Backport] Add notes filters for epics
Diffstat (limited to 'spec/controllers')
| -rw-r--r-- | spec/controllers/projects/issues_controller_spec.rb | 1 | ||||
| -rw-r--r-- | spec/controllers/projects/merge_requests_controller_spec.rb | 1 |
2 files changed, 2 insertions, 0 deletions
diff --git a/spec/controllers/projects/issues_controller_spec.rb b/spec/controllers/projects/issues_controller_spec.rb index e0b6105bb94..923e0acc28c 100644 --- a/spec/controllers/projects/issues_controller_spec.rb +++ b/spec/controllers/projects/issues_controller_spec.rb @@ -1131,6 +1131,7 @@ describe Projects::IssuesController do context 'when user is setting notes filters' do let(:issuable) { issue } + let(:issuable_parent) { project } let!(:discussion_note) { create(:discussion_note_on_issue, :system, noteable: issuable, project: project) } it_behaves_like 'issuable notes filter' diff --git a/spec/controllers/projects/merge_requests_controller_spec.rb b/spec/controllers/projects/merge_requests_controller_spec.rb index 4f4d3ca226f..4451fd227e8 100644 --- a/spec/controllers/projects/merge_requests_controller_spec.rb +++ b/spec/controllers/projects/merge_requests_controller_spec.rb @@ -78,6 +78,7 @@ describe Projects::MergeRequestsController do context 'when user is setting notes filters' do let(:issuable) { merge_request } + let(:issuable_parent) { project } let!(:discussion_note) { create(:discussion_note_on_merge_request, :system, noteable: issuable, project: project) } let!(:discussion_comment) { create(:discussion_note_on_merge_request, noteable: issuable, project: project) } |