diff options
author | GitLab Bot <gitlab-bot@gitlab.com> | 2022-03-18 23:02:30 +0300 |
---|---|---|
committer | GitLab Bot <gitlab-bot@gitlab.com> | 2022-03-18 23:02:30 +0300 |
commit | 41fe97390ceddf945f3d967b8fdb3de4c66b7dea (patch) | |
tree | 9c8d89a8624828992f06d892cd2f43818ff5dcc8 /spec/support/shared_examples/lib | |
parent | 0804d2dc31052fb45a1efecedc8e06ce9bc32862 (diff) |
Add latest changes from gitlab-org/gitlab@14-9-stable-eev14.9.0-rc42
Diffstat (limited to 'spec/support/shared_examples/lib')
3 files changed, 109 insertions, 11 deletions
diff --git a/spec/support/shared_examples/lib/gitlab/database/background_migration_job_shared_examples.rb b/spec/support/shared_examples/lib/gitlab/database/background_migration_job_shared_examples.rb index 213f084be17..771ab89972c 100644 --- a/spec/support/shared_examples/lib/gitlab/database/background_migration_job_shared_examples.rb +++ b/spec/support/shared_examples/lib/gitlab/database/background_migration_job_shared_examples.rb @@ -2,7 +2,7 @@ RSpec.shared_examples 'marks background migration job records' do it 'marks each job record as succeeded after processing' do - create(:background_migration_job, class_name: "::#{described_class.name}", + create(:background_migration_job, class_name: "::#{described_class.name.demodulize}", arguments: arguments) expect(::Gitlab::Database::BackgroundMigrationJob).to receive(:mark_all_as_succeeded).and_call_original @@ -13,7 +13,7 @@ RSpec.shared_examples 'marks background migration job records' do end it 'returns the number of job records marked as succeeded' do - create(:background_migration_job, class_name: "::#{described_class.name}", + create(:background_migration_job, class_name: "::#{described_class.name.demodulize}", arguments: arguments) jobs_updated = subject.perform(*arguments) diff --git a/spec/support/shared_examples/lib/gitlab/usage_data_counters/usage_counter_shared_examples.rb b/spec/support/shared_examples/lib/gitlab/usage_data_counters/usage_counter_shared_examples.rb new file mode 100644 index 00000000000..848437577d7 --- /dev/null +++ b/spec/support/shared_examples/lib/gitlab/usage_data_counters/usage_counter_shared_examples.rb @@ -0,0 +1,40 @@ +# frozen_string_literal: true + +RSpec.shared_examples 'a usage counter' do + describe '.increment' do + let(:project_id) { 12 } + + it 'intializes and increments the counter for the project by 1' do + expect do + described_class.increment(project_id) + end.to change { described_class.usage_totals[project_id] }.from(nil).to(1) + end + end + + describe '.usage_totals' do + let(:usage_totals) { described_class.usage_totals } + + context 'when the feature has not been used' do + it 'returns the total counts and counts per project' do + expect(usage_totals.keys).to eq([:total]) + expect(usage_totals[:total]).to eq(0) + end + end + + context 'when the feature has been used in multiple projects' do + let(:project1_id) { 12 } + let(:project2_id) { 16 } + + before do + described_class.increment(project1_id) + described_class.increment(project2_id) + end + + it 'returns the total counts and counts per project' do + expect(usage_totals[project1_id]).to eq(1) + expect(usage_totals[project2_id]).to eq(1) + expect(usage_totals[:total]).to eq(2) + end + end + end +end diff --git a/spec/support/shared_examples/lib/wikis_api_examples.rb b/spec/support/shared_examples/lib/wikis_api_examples.rb index 2e4c667d37e..f068a7676ad 100644 --- a/spec/support/shared_examples/lib/wikis_api_examples.rb +++ b/spec/support/shared_examples/lib/wikis_api_examples.rb @@ -44,13 +44,70 @@ RSpec.shared_examples_for 'wikis API returns list of wiki pages' do end RSpec.shared_examples_for 'wikis API returns wiki page' do - it 'returns the wiki page' do - expect(response).to have_gitlab_http_status(:ok) - expect(json_response.size).to eq(4) - expect(json_response.keys).to match_array(expected_keys_with_content) - expect(json_response['content']).to eq(page.content) - expect(json_response['slug']).to eq(page.slug) - expect(json_response['title']).to eq(page.title) + subject(:request) { get api(url, user), params: params } + + shared_examples 'returns wiki page' do + before do + request + end + + specify do + expect(response).to have_gitlab_http_status(:ok) + expect(json_response.size).to eq(5) + expect(json_response.keys).to match_array(expected_keys_with_content) + expect(json_response['content']).to eq(expected_content) + expect(json_response['slug']).to eq(page.slug) + expect(json_response['title']).to eq(page.title) + end + end + + let(:expected_content) { page.content } + + it_behaves_like 'returns wiki page' + + context 'when render param is false' do + let(:params) { { render_html: false } } + + it_behaves_like 'returns wiki page' + end + + context 'when render param is true' do + let(:params) { { render_html: true } } + let(:expected_content) { '<p data-sourcepos="1:1-1:21" dir="auto">Content for wiki page</p>' } + + it_behaves_like 'returns wiki page' + end + + context 'when wiki page has versions' do + let(:new_content) { 'New content' } + + before do + wiki.update_page(page.page, content: new_content, message: 'updated page') + + expect(page.count_versions).to eq(2) + + request + end + + context 'when version param is not present' do + it 'retrieves the last version' do + expect(json_response['content']).to eq(new_content) + end + end + + context 'when version param is set' do + let(:params) { { version: page.version.id } } + + it 'retrieves the specific page version' do + expect(json_response['content']).to eq(page.content) + end + + context 'when version param is not valid or inexistent' do + let(:params) { { version: 'foobar' } } + + it_behaves_like 'wiki API 404 Wiki Page Not Found' + end + end end end @@ -59,12 +116,13 @@ RSpec.shared_examples_for 'wikis API creates wiki page' do post(api(url, user), params: payload) expect(response).to have_gitlab_http_status(:created) - expect(json_response.size).to eq(4) + expect(json_response.size).to eq(5) expect(json_response.keys).to match_array(expected_keys_with_content) expect(json_response['content']).to eq(payload[:content]) expect(json_response['slug']).to eq(payload[:title].tr(' ', '-')) expect(json_response['title']).to eq(payload[:title]) expect(json_response['rdoc']).to eq(payload[:rdoc]) + expect(json_response['encoding']).to eq('UTF-8') end [:title, :content].each do |part| @@ -85,7 +143,7 @@ RSpec.shared_examples_for 'wikis API updates wiki page' do put(api(url, user), params: payload) expect(response).to have_gitlab_http_status(:ok) - expect(json_response.size).to eq(4) + expect(json_response.size).to eq(5) expect(json_response.keys).to match_array(expected_keys_with_content) expect(json_response['content']).to eq(payload[:content]) expect(json_response['slug']).to eq(payload[:title].tr(' ', '-')) |