diff options
author | Lin Jen-Shin <godfat@godfat.org> | 2017-10-16 18:06:16 +0800 |
---|---|---|
committer | Lin Jen-Shin <godfat@godfat.org> | 2017-10-16 18:06:16 +0800 |
commit | 02fc18b5cc6223a129d6f6af1e8037736ce94462 (patch) | |
tree | 9e2173c7de20e606aadb5db504defb5853c841ff | |
parent | de32a17d8f5a1112d0e27908440305545c82e7d1 (diff) | |
download | gitlab-ce-02fc18b5cc6223a129d6f6af1e8037736ce94462.tar.gz |
Those tests were tested under authenticated
On master, so we should move them under authenticated.
-rw-r--r-- | spec/controllers/projects/issues_controller_spec.rb | 42 |
1 files changed, 21 insertions, 21 deletions
diff --git a/spec/controllers/projects/issues_controller_spec.rb b/spec/controllers/projects/issues_controller_spec.rb index e9cc398a98e..ed8088a46f0 100644 --- a/spec/controllers/projects/issues_controller_spec.rb +++ b/spec/controllers/projects/issues_controller_spec.rb @@ -861,37 +861,37 @@ describe Projects::IssuesController do expect(json_response.first.keys).to match_array(%w[id reply_id expanded notes individual_note]) end - end - context 'with cross-reference system note', :request_store do - let(:new_issue) { create(:issue) } - let(:cross_reference) { "mentioned in #{new_issue.to_reference(issue.project)}" } + context 'with cross-reference system note', :request_store do + let(:new_issue) { create(:issue) } + let(:cross_reference) { "mentioned in #{new_issue.to_reference(issue.project)}" } - before do - create(:discussion_note_on_issue, :system, noteable: issue, project: issue.project, note: cross_reference) - end + before do + create(:discussion_note_on_issue, :system, noteable: issue, project: issue.project, note: cross_reference) + end - it 'filters notes that the user should not see' do - get :discussions, namespace_id: project.namespace, project_id: project, id: issue.iid + it 'filters notes that the user should not see' do + get :discussions, namespace_id: project.namespace, project_id: project, id: issue.iid - expect(JSON.parse(response.body).count).to eq(1) - end + expect(JSON.parse(response.body).count).to eq(1) + end - it 'does not result in N+1 queries' do - # Instantiate the controller variables to ensure QueryRecorder has an accurate base count - get :discussions, namespace_id: project.namespace, project_id: project, id: issue.iid + it 'does not result in N+1 queries' do + # Instantiate the controller variables to ensure QueryRecorder has an accurate base count + get :discussions, namespace_id: project.namespace, project_id: project, id: issue.iid - RequestStore.clear! + RequestStore.clear! - control_count = ActiveRecord::QueryRecorder.new do - get :discussions, namespace_id: project.namespace, project_id: project, id: issue.iid - end.count + control_count = ActiveRecord::QueryRecorder.new do + get :discussions, namespace_id: project.namespace, project_id: project, id: issue.iid + end.count - RequestStore.clear! + RequestStore.clear! - create_list(:discussion_note_on_issue, 2, :system, noteable: issue, project: issue.project, note: cross_reference) + create_list(:discussion_note_on_issue, 2, :system, noteable: issue, project: issue.project, note: cross_reference) - expect { get :discussions, namespace_id: project.namespace, project_id: project, id: issue.iid }.not_to exceed_query_limit(control_count) + expect { get :discussions, namespace_id: project.namespace, project_id: project, id: issue.iid }.not_to exceed_query_limit(control_count) + end end end end |