diff options
author | GitLab Bot <gitlab-bot@gitlab.com> | 2020-03-24 15:09:42 +0300 |
---|---|---|
committer | GitLab Bot <gitlab-bot@gitlab.com> | 2020-03-24 15:09:42 +0300 |
commit | 729e3765d5feb762df1ccfbc228a8dd4662aa3f9 (patch) | |
tree | f326420fc64999c6bcc28816ed54f0972fb46459 /spec/lib | |
parent | 6f7881ee9dcec34141a8f34fc814b56b366d2b48 (diff) |
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'spec/lib')
-rw-r--r-- | spec/lib/api/entities/release_spec.rb | 34 | ||||
-rw-r--r-- | spec/lib/event_filter_spec.rb | 50 | ||||
-rw-r--r-- | spec/lib/gitlab/import_export/all_models.yml | 2 | ||||
-rw-r--r-- | spec/lib/gitlab/import_export/safe_model_attributes.yml | 2 |
4 files changed, 70 insertions, 18 deletions
diff --git a/spec/lib/api/entities/release_spec.rb b/spec/lib/api/entities/release_spec.rb index f0bbaa35efe..c45dbc15856 100644 --- a/spec/lib/api/entities/release_spec.rb +++ b/spec/lib/api/entities/release_spec.rb @@ -4,26 +4,29 @@ require 'spec_helper' describe API::Entities::Release do let_it_be(:project) { create(:project) } - let_it_be(:user) { create(:user) } - let(:entity) { described_class.new(release, current_user: user) } - - describe 'evidence' do - let(:release) { create(:release, :with_evidence, project: project) } - - subject { entity.as_json } + let_it_be(:release) { create(:release, :with_evidence, project: project) } + let(:evidence) { release.evidences.first } + let(:user) { create(:user) } + let(:entity) { described_class.new(release, current_user: user).as_json } + describe 'evidences' do context 'when the current user can download code' do + let(:entity_evidence) { entity[:evidences].first } + it 'exposes the evidence sha and the json path' do allow(Ability).to receive(:allowed?).and_call_original allow(Ability).to receive(:allowed?) .with(user, :download_code, project).and_return(true) - expect(subject[:evidence_sha]).to eq(release.evidence_sha) - expect(subject[:assets][:evidence_file_path]).to eq( - Gitlab::Routing.url_helpers.evidence_project_release_url(project, - release.tag, - format: :json) - ) + expect(entity_evidence[:sha]).to eq(evidence.summary_sha) + expect(entity_evidence[:collected_at]).to eq(evidence.collected_at) + expect(entity_evidence[:filepath]).to eq( + Gitlab::Routing.url_helpers.namespace_project_evidence_url( + namespace_id: project.namespace, + project_id: project, + tag: release, + id: evidence.id, + format: :json)) end end @@ -33,8 +36,7 @@ describe API::Entities::Release do allow(Ability).to receive(:allowed?) .with(user, :download_code, project).and_return(false) - expect(subject.keys).not_to include(:evidence_sha) - expect(subject[:assets].keys).not_to include(:evidence_file_path) + expect(entity.keys).not_to include(:evidences) end end end @@ -45,7 +47,7 @@ describe API::Entities::Release do let(:issue_title) { 'title="%s"' % issue.title } let(:release) { create(:release, project: project, description: "Now shipping #{issue.to_reference}") } - subject(:description_html) { entity.as_json[:description_html] } + subject(:description_html) { entity.as_json['description_html'] } it 'renders special references if current user has access' do project.add_reporter(user) diff --git a/spec/lib/event_filter_spec.rb b/spec/lib/event_filter_spec.rb index e35698f6030..da6e1f9458f 100644 --- a/spec/lib/event_filter_spec.rb +++ b/spec/lib/event_filter_spec.rb @@ -28,6 +28,8 @@ describe EventFilter do let_it_be(:comments_event) { create(:event, :commented, project: public_project, target: public_project) } let_it_be(:joined_event) { create(:event, :joined, project: public_project, target: public_project) } let_it_be(:left_event) { create(:event, :left, project: public_project, target: public_project) } + let_it_be(:wiki_page_event) { create(:wiki_page_event) } + let_it_be(:wiki_page_update_event) { create(:wiki_page_event, :updated) } let(:filtered_events) { described_class.new(filter).apply_filter(Event.all) } @@ -77,6 +79,34 @@ describe EventFilter do it 'returns all events' do expect(filtered_events).to eq(Event.all) end + + context 'the :wiki_events filter is disabled' do + before do + stub_feature_flags(wiki_events: false) + end + + it 'does not return wiki events' do + expect(filtered_events).to eq(Event.not_wiki_page) + end + end + end + + context 'with the "wiki" filter' do + let(:filter) { described_class::WIKI } + + it 'returns only wiki page events' do + expect(filtered_events).to contain_exactly(wiki_page_event, wiki_page_update_event) + end + + context 'the :wiki_events filter is disabled' do + before do + stub_feature_flags(wiki_events: false) + end + + it 'does not return wiki events' do + expect(filtered_events).not_to include(wiki_page_event, wiki_page_update_event) + end + end end context 'with an unknown filter' do @@ -85,6 +115,16 @@ describe EventFilter do it 'returns all events' do expect(filtered_events).to eq(Event.all) end + + context 'the :wiki_events filter is disabled' do + before do + stub_feature_flags(wiki_events: false) + end + + it 'does not return wiki events' do + expect(filtered_events).to eq(Event.not_wiki_page) + end + end end context 'with a nil filter' do @@ -93,6 +133,16 @@ describe EventFilter do it 'returns all events' do expect(filtered_events).to eq(Event.all) end + + context 'the :wiki_events filter is disabled' do + before do + stub_feature_flags(wiki_events: false) + end + + it 'does not return wiki events' do + expect(filtered_events).to eq(Event.not_wiki_page) + end + end end end diff --git a/spec/lib/gitlab/import_export/all_models.yml b/spec/lib/gitlab/import_export/all_models.yml index b3f279344b1..0ed5a1e7b49 100644 --- a/spec/lib/gitlab/import_export/all_models.yml +++ b/spec/lib/gitlab/import_export/all_models.yml @@ -94,7 +94,7 @@ releases: - links - milestone_releases - milestones -- evidence +- evidences links: - release project_members: diff --git a/spec/lib/gitlab/import_export/safe_model_attributes.yml b/spec/lib/gitlab/import_export/safe_model_attributes.yml index 5b0444c394e..533458afd73 100644 --- a/spec/lib/gitlab/import_export/safe_model_attributes.yml +++ b/spec/lib/gitlab/import_export/safe_model_attributes.yml @@ -134,7 +134,7 @@ Release: - created_at - updated_at - released_at -Evidence: +Releases::Evidence: - id - summary - created_at |