diff options
author | GitLab Bot <gitlab-bot@gitlab.com> | 2020-12-17 11:59:07 +0000 |
---|---|---|
committer | GitLab Bot <gitlab-bot@gitlab.com> | 2020-12-17 11:59:07 +0000 |
commit | 8b573c94895dc0ac0e1d9d59cf3e8745e8b539ca (patch) | |
tree | 544930fb309b30317ae9797a9683768705d664c4 /spec/presenters | |
parent | 4b1de649d0168371549608993deac953eb692019 (diff) | |
download | gitlab-ce-8b573c94895dc0ac0e1d9d59cf3e8745e8b539ca.tar.gz |
Add latest changes from gitlab-org/gitlab@13-7-stable-eev13.7.0-rc42
Diffstat (limited to 'spec/presenters')
6 files changed, 78 insertions, 7 deletions
diff --git a/spec/presenters/gitlab/whats_new/item_presenter_spec.rb b/spec/presenters/gitlab/whats_new/item_presenter_spec.rb new file mode 100644 index 00000000000..9b04741aa60 --- /dev/null +++ b/spec/presenters/gitlab/whats_new/item_presenter_spec.rb @@ -0,0 +1,29 @@ +# frozen_string_literal: true + +require 'spec_helper' + +RSpec.describe Gitlab::WhatsNew::ItemPresenter do + let(:present) { Gitlab::WhatsNew::ItemPresenter.present(item) } + let(:item) { { "packages" => %w(Core Starter Premium Ultimate) } } + let(:gitlab_com) { true } + + before do + allow(Gitlab).to receive(:com?).and_return(gitlab_com) + end + + describe '.present' do + context 'when on Gitlab.com' do + it 'transforms package names to gitlab.com friendly package names' do + expect(present).to eq({ "packages" => %w(Free Bronze Silver Gold) }) + end + end + + context 'when not on Gitlab.com' do + let(:gitlab_com) { false } + + it 'does not transform package names' do + expect(present).to eq({ "packages" => %w(Core Starter Premium Ultimate) }) + end + end + end +end diff --git a/spec/presenters/packages/composer/packages_presenter_spec.rb b/spec/presenters/packages/composer/packages_presenter_spec.rb index 0445a346180..19d99a62468 100644 --- a/spec/presenters/packages/composer/packages_presenter_spec.rb +++ b/spec/presenters/packages/composer/packages_presenter_spec.rb @@ -67,7 +67,7 @@ RSpec.describe ::Packages::Composer::PackagesPresenter do { 'packages' => [], 'provider-includes' => { 'p/%hash%.json' => { 'sha256' => /^\h+$/ } }, - 'providers-url' => "/api/v4/group/#{group.id}/-/packages/composer/%package%.json" + 'providers-url' => "/api/v4/group/#{group.id}/-/packages/composer/%package%$%hash%.json" } end diff --git a/spec/presenters/project_presenter_spec.rb b/spec/presenters/project_presenter_spec.rb index b7fee5253f8..a9050c233af 100644 --- a/spec/presenters/project_presenter_spec.rb +++ b/spec/presenters/project_presenter_spec.rb @@ -375,7 +375,7 @@ RSpec.describe ProjectPresenter do it 'returns anchor data' do project.add_developer(user) - allow(project.repository).to receive(:readme).and_return(nil) + allow(project.repository).to receive(:readme_path).and_return(nil) expect(presenter.readme_anchor_data).to have_attributes( is_link: false, @@ -387,7 +387,7 @@ RSpec.describe ProjectPresenter do context 'when README exists' do it 'returns anchor data' do - allow(project.repository).to receive(:readme).and_return(double(name: 'readme')) + allow(project.repository).to receive(:readme_path).and_return('readme') expect(presenter.readme_anchor_data).to have_attributes( is_link: false, @@ -561,7 +561,7 @@ RSpec.describe ProjectPresenter do let(:project) { build_stubbed(:project) } it 'orders the items correctly' do - allow(project.repository).to receive(:readme).and_return(double(name: 'readme')) + allow(project.repository).to receive(:readme_path).and_return('readme') allow(project.repository).to receive(:license_blob).and_return(nil) allow(project.repository).to receive(:changelog).and_return(nil) allow(project.repository).to receive(:contribution_guide).and_return(double(name: 'foo')) diff --git a/spec/presenters/projects/import_export/project_export_presenter_spec.rb b/spec/presenters/projects/import_export/project_export_presenter_spec.rb index 8463d01d95b..b2b2ce35f34 100644 --- a/spec/presenters/projects/import_export/project_export_presenter_spec.rb +++ b/spec/presenters/projects/import_export/project_export_presenter_spec.rb @@ -45,6 +45,14 @@ RSpec.describe Projects::ImportExport::ProjectExportPresenter do end end + describe '#protected_branches' do + it 'returns the project exported protected branches' do + expect(project).to receive(:exported_protected_branches) + + subject.protected_branches + end + end + describe '#project_members' do let(:user2) { create(:user, email: 'group@member.com') } let(:member_emails) do diff --git a/spec/presenters/search_service_presenter_spec.rb b/spec/presenters/search_service_presenter_spec.rb new file mode 100644 index 00000000000..06ece838d8d --- /dev/null +++ b/spec/presenters/search_service_presenter_spec.rb @@ -0,0 +1,34 @@ +# frozen_string_literal: true + +require 'spec_helper' + +RSpec.describe SearchServicePresenter do + let(:user) { create(:user) } + let(:search_service) { SearchService.new(user, search: search, scope: scope) } + let(:presenter) { described_class.new(search_service, current_user: user) } + + describe '#show_results_status?' do + using RSpec::Parameterized::TableSyntax + + let(:search) { '' } + let(:scope) { nil } + + before do + allow(presenter).to receive(:search_objects).and_return([]) + allow(presenter).to receive(:without_count?).and_return(!with_count) + allow(presenter).to receive(:show_snippets?).and_return(show_snippets) + allow(presenter).to receive(:show_sort_dropdown?).and_return(show_sort_dropdown) + end + + where(:with_count, :show_snippets, :show_sort_dropdown, :result) do + true | true | true | true + false | true | false | true + false | false | true | true + false | false | false | false + end + + with_them do + it { expect(presenter.show_results_status?).to eq(result) } + end + end +end diff --git a/spec/presenters/snippet_presenter_spec.rb b/spec/presenters/snippet_presenter_spec.rb index 66c6ba8fa0e..a1d987ed78f 100644 --- a/spec/presenters/snippet_presenter_spec.rb +++ b/spec/presenters/snippet_presenter_spec.rb @@ -72,7 +72,7 @@ RSpec.describe SnippetPresenter do context 'with ProjectSnippet' do let(:snippet) { project_snippet } - it 'checks read_snippet ' do + it 'checks read_snippet' do expect(presenter).to receive(:can?).with(user, :read_snippet, snippet) subject @@ -96,7 +96,7 @@ RSpec.describe SnippetPresenter do context 'with ProjectSnippet' do let(:snippet) { project_snippet } - it 'checks update_snippet ' do + it 'checks update_snippet' do expect(presenter).to receive(:can?).with(user, :update_snippet, snippet) subject @@ -120,7 +120,7 @@ RSpec.describe SnippetPresenter do context 'with ProjectSnippet' do let(:snippet) { project_snippet } - it 'checks admin_snippet ' do + it 'checks admin_snippet' do expect(presenter).to receive(:can?).with(user, :admin_snippet, snippet) subject |