diff options
Diffstat (limited to 'spec')
719 files changed, 1362 insertions, 834 deletions
diff --git a/spec/frontend/alert_management/components/alert_management_list_spec.js b/spec/frontend/alert_management/components/alert_management_list_spec.js index 541f78fb5d8..456e5ecb2c2 100644 --- a/spec/frontend/alert_management/components/alert_management_list_spec.js +++ b/spec/frontend/alert_management/components/alert_management_list_spec.js @@ -15,7 +15,6 @@ import { } from '@gitlab/ui'; import { visitUrl } from '~/lib/utils/url_utility'; import TimeAgo from '~/vue_shared/components/time_ago_tooltip.vue'; -import createFlash from '~/flash'; import AlertManagementList from '~/alert_management/components/alert_management_list.vue'; import { ALERTS_STATUS_TABS, @@ -26,8 +25,6 @@ import updateAlertStatus from '~/alert_management/graphql/mutations/update_alert import mockAlerts from '../mocks/alerts.json'; import Tracking from '~/tracking'; -jest.mock('~/flash'); - jest.mock('~/lib/utils/url_utility', () => ({ visitUrl: jest.fn().mockName('visitUrlMock'), joinPaths: jest.requireActual('~/lib/utils/url_utility').joinPaths, @@ -391,14 +388,15 @@ describe('AlertManagementList', () => { }); }); - it('calls `createFlash` when request fails', () => { + it('shows an error when request fails', () => { jest.spyOn(wrapper.vm.$apollo, 'mutate').mockReturnValue(Promise.reject(new Error())); findFirstStatusOption().vm.$emit('click'); + wrapper.setData({ + errored: true, + }); - setImmediate(() => { - expect(createFlash).toHaveBeenCalledWith( - 'There was an error while updating the status of the alert. Please try again.', - ); + wrapper.vm.$nextTick(() => { + expect(wrapper.find('[data-testid="alert-error"]').exists()).toBe(true); }); }); }); diff --git a/spec/frontend/alert_management/components/alert_sidebar_status_spec.js b/spec/frontend/alert_management/components/alert_sidebar_status_spec.js index 94643966a43..aa0cb230e5b 100644 --- a/spec/frontend/alert_management/components/alert_sidebar_status_spec.js +++ b/spec/frontend/alert_management/components/alert_sidebar_status_spec.js @@ -1,4 +1,4 @@ -import { shallowMount } from '@vue/test-utils'; +import { mount } from '@vue/test-utils'; import { GlDropdownItem, GlLoadingIcon } from '@gitlab/ui'; import { trackAlertStatusUpdateOptions } from '~/alert_management/constants'; import AlertSidebarStatus from '~/alert_management/components/sidebar/sidebar_status.vue'; @@ -14,7 +14,7 @@ describe('Alert Details Sidebar Status', () => { const findStatusLoadingIcon = () => wrapper.find(GlLoadingIcon); function mountComponent({ data, sidebarCollapsed = true, loading = false, stubs = {} } = {}) { - wrapper = shallowMount(AlertSidebarStatus, { + wrapper = mount(AlertSidebarStatus, { propsData: { alert: { ...mockAlert }, ...data, diff --git a/spec/frontend/diffs/components/diff_gutter_avatars_spec.js b/spec/frontend/diffs/components/diff_gutter_avatars_spec.js index da18d8e7894..61e110b345a 100644 --- a/spec/frontend/diffs/components/diff_gutter_avatars_spec.js +++ b/spec/frontend/diffs/components/diff_gutter_avatars_spec.js @@ -110,7 +110,7 @@ describe('DiffGutterAvatars', () => { it('returns truncated version of comment if it is longer than max length', () => { const note = wrapper.vm.discussions[0].notes[1]; - expect(wrapper.vm.getTooltipText(note)).toEqual('Fatih Acet: comment 2 is r...'); + expect(wrapper.vm.getTooltipText(note)).toEqual('Fatih Acet: comment 2 is rea…'); }); }); }); diff --git a/spec/frontend/helpers/event_hub_factory_spec.js b/spec/frontend/helpers/event_hub_factory_spec.js index d29b9ddba34..c4f63ff6049 100644 --- a/spec/frontend/helpers/event_hub_factory_spec.js +++ b/spec/frontend/helpers/event_hub_factory_spec.js @@ -1,17 +1,21 @@ import createEventHub from '~/helpers/event_hub_factory'; const TEST_EVENT = 'foobar'; +const TEST_EVENT_2 = 'testevent'; describe('event bus factory', () => { let eventBus; let handler; + let otherHandlers; beforeEach(() => { eventBus = createEventHub(); handler = jest.fn(); + otherHandlers = [jest.fn(), jest.fn()]; }); afterEach(() => { + eventBus.dispose(); eventBus = null; }); @@ -48,22 +52,6 @@ describe('event bus factory', () => { expect(handler).toHaveBeenCalledTimes(2); }); - - it('does not call handler after $off with handler', () => { - eventBus.$off(TEST_EVENT, handler); - - eventBus.$emit(TEST_EVENT); - - expect(handler).not.toHaveBeenCalled(); - }); - - it('does not call handler after $off', () => { - eventBus.$off(TEST_EVENT); - - eventBus.$emit(TEST_EVENT); - - expect(handler).not.toHaveBeenCalled(); - }); }); describe('$once', () => { @@ -102,4 +90,55 @@ describe('event bus factory', () => { }); }); }); + + describe('$off', () => { + beforeEach(() => { + otherHandlers.forEach(x => eventBus.$on(TEST_EVENT, x)); + eventBus.$on(TEST_EVENT, handler); + }); + + it('can be called on event with no handlers', () => { + expect(() => { + eventBus.$off(TEST_EVENT_2); + }).not.toThrow(); + }); + + it('can be called on event with no handlers, with a handler', () => { + expect(() => { + eventBus.$off(TEST_EVENT_2, handler); + }).not.toThrow(); + }); + + it('with a handler, will no longer call that handler', () => { + eventBus.$off(TEST_EVENT, handler); + + eventBus.$emit(TEST_EVENT); + + expect(handler).not.toHaveBeenCalled(); + expect(otherHandlers.map(x => x.mock.calls.length)).toEqual(otherHandlers.map(() => 1)); + }); + + it('without a handler, will no longer call any handlers', () => { + eventBus.$off(TEST_EVENT); + + eventBus.$emit(TEST_EVENT); + + expect(handler).not.toHaveBeenCalled(); + expect(otherHandlers.map(x => x.mock.calls.length)).toEqual(otherHandlers.map(() => 0)); + }); + }); + + describe('$emit', () => { + beforeEach(() => { + otherHandlers.forEach(x => eventBus.$on(TEST_EVENT_2, x)); + eventBus.$on(TEST_EVENT, handler); + }); + + it('only calls handlers for given type', () => { + eventBus.$emit(TEST_EVENT, 'arg1'); + + expect(handler).toHaveBeenCalledWith('arg1'); + expect(otherHandlers.map(x => x.mock.calls.length)).toEqual(otherHandlers.map(() => 0)); + }); + }); }); diff --git a/spec/frontend/lib/utils/text_utility_spec.js b/spec/frontend/lib/utils/text_utility_spec.js index 76e0e435860..285f7d04c3b 100644 --- a/spec/frontend/lib/utils/text_utility_spec.js +++ b/spec/frontend/lib/utils/text_utility_spec.js @@ -145,6 +145,56 @@ describe('text_utility', () => { }); }); + describe('truncate', () => { + it('returns the original string when str length is less than maxLength', () => { + const str = 'less than 20 chars'; + expect(textUtils.truncate(str, 20)).toEqual(str); + }); + + it('returns truncated string when str length is more than maxLength', () => { + const str = 'more than 10 chars'; + expect(textUtils.truncate(str, 10)).toEqual(`${str.substring(0, 10 - 1)}…`); + }); + + it('returns the original string when rendered width is exactly equal to maxWidth', () => { + const str = 'Exactly 16 chars'; + expect(textUtils.truncate(str, 16)).toEqual(str); + }); + }); + + describe('truncateWidth', () => { + const clientWidthDescriptor = Object.getOwnPropertyDescriptor(Element.prototype, 'clientWidth'); + + beforeAll(() => { + // Mock measured width of ' ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789' + Object.defineProperty(Element.prototype, 'clientWidth', { + value: 431, + writable: false, + }); + }); + + afterAll(() => { + Object.defineProperty(Element.prototype, 'clientWidth', clientWidthDescriptor); + }); + + it('returns the original string when rendered width is less than maxWidth', () => { + const str = '< 80px'; + expect(textUtils.truncateWidth(str)).toEqual(str); + }); + + it('returns truncated string when rendered width is more than maxWidth', () => { + const str = 'This is wider than 80px'; + expect(textUtils.truncateWidth(str)).toEqual(`${str.substring(0, 10)}…`); + }); + + it('returns the original string when rendered width is exactly equal to maxWidth', () => { + const str = 'Exactly 159.62962962962965px'; + expect(textUtils.truncateWidth(str, { maxWidth: 159.62962962962965, fontSize: 10 })).toEqual( + str, + ); + }); + }); + describe('truncateSha', () => { it('shortens SHAs to 8 characters', () => { expect(textUtils.truncateSha('verylongsha')).toBe('verylong'); diff --git a/spec/frontend/releases/components/release_block_assets_spec.js b/spec/frontend/releases/components/release_block_assets_spec.js index 44b190b0d19..a85532a8118 100644 --- a/spec/frontend/releases/components/release_block_assets_spec.js +++ b/spec/frontend/releases/components/release_block_assets_spec.js @@ -4,6 +4,7 @@ import ReleaseBlockAssets from '~/releases/components/release_block_assets.vue'; import { ASSET_LINK_TYPE } from '~/releases/constants'; import { trimText } from 'helpers/text_helper'; import { assets } from '../mock_data'; +import { cloneDeep } from 'lodash'; describe('Release block assets', () => { let wrapper; @@ -30,7 +31,7 @@ describe('Release block assets', () => { wrapper.findAll('h5').filter(h5 => h5.text() === sections[type]); beforeEach(() => { - defaultProps = { assets }; + defaultProps = { assets: cloneDeep(assets) }; }); describe('with default props', () => { @@ -96,6 +97,35 @@ describe('Release block assets', () => { }); }); + describe('sources', () => { + const testSources = ({ shouldSourcesBeRendered }) => { + assets.sources.forEach(s => { + expect(wrapper.find(`a[href="${s.url}"]`).exists()).toBe(shouldSourcesBeRendered); + }); + }; + + describe('when the release has sources', () => { + beforeEach(() => { + createComponent(defaultProps); + }); + + it('renders sources', () => { + testSources({ shouldSourcesBeRendered: true }); + }); + }); + + describe('when the release does not have sources', () => { + beforeEach(() => { + delete defaultProps.assets.sources; + createComponent(defaultProps); + }); + + it('does not render any sources', () => { + testSources({ shouldSourcesBeRendered: false }); + }); + }); + }); + describe('external vs internal links', () => { const containsExternalSourceIndicator = () => wrapper.contains('[data-testid="external-link-indicator"]'); diff --git a/spec/frontend/vue_shared/components/rich_content_editor/services/renderers/build_uneditable_token_spec.js b/spec/frontend/vue_shared/components/rich_content_editor/services/renderers/build_uneditable_token_spec.js index 89cc7ea1390..2daca6500c5 100644 --- a/spec/frontend/vue_shared/components/rich_content_editor/services/renderers/build_uneditable_token_spec.js +++ b/spec/frontend/vue_shared/components/rich_content_editor/services/renderers/build_uneditable_token_spec.js @@ -2,7 +2,7 @@ import { buildUneditableOpenTokens, buildUneditableCloseToken, buildUneditableTokens, -} from '~/vue_shared/components/rich_content_editor/services/renderers//build_uneditable_token'; +} from '~/vue_shared/components/rich_content_editor/services/renderers/build_uneditable_token'; import { originToken, diff --git a/spec/frontend/vue_shared/components/rich_content_editor/services/renderers/render_kramdown_list_spec.js b/spec/frontend/vue_shared/components/rich_content_editor/services/renderers/render_kramdown_list_spec.js index 76a918234fe..8b8a8459ca2 100644 --- a/spec/frontend/vue_shared/components/rich_content_editor/services/renderers/render_kramdown_list_spec.js +++ b/spec/frontend/vue_shared/components/rich_content_editor/services/renderers/render_kramdown_list_spec.js @@ -2,7 +2,7 @@ import renderer from '~/vue_shared/components/rich_content_editor/services/rende import { buildUneditableOpenTokens, buildUneditableCloseToken, -} from '~/vue_shared/components/rich_content_editor/services/renderers//build_uneditable_token'; +} from '~/vue_shared/components/rich_content_editor/services/renderers/build_uneditable_token'; import { kramdownListNode, normalListNode } from '../../mock_data'; diff --git a/spec/frontend/vue_shared/components/rich_content_editor/services/renderers/render_kramdown_text_spec.js b/spec/frontend/vue_shared/components/rich_content_editor/services/renderers/render_kramdown_text_spec.js index e4b2ac26b63..d52febad436 100644 --- a/spec/frontend/vue_shared/components/rich_content_editor/services/renderers/render_kramdown_text_spec.js +++ b/spec/frontend/vue_shared/components/rich_content_editor/services/renderers/render_kramdown_text_spec.js @@ -1,5 +1,5 @@ import renderer from '~/vue_shared/components/rich_content_editor/services/renderers/render_kramdown_text'; -import { buildUneditableTokens } from '~/vue_shared/components/rich_content_editor/services/renderers//build_uneditable_token'; +import { buildUneditableTokens } from '~/vue_shared/components/rich_content_editor/services/renderers/build_uneditable_token'; import { kramdownTextNode, normalTextNode } from '../../mock_data'; diff --git a/spec/graphql/types/milestone_stats_type_spec.rb b/spec/graphql/types/milestone_stats_type_spec.rb new file mode 100644 index 00000000000..62c2c2ca058 --- /dev/null +++ b/spec/graphql/types/milestone_stats_type_spec.rb @@ -0,0 +1,15 @@ +# frozen_string_literal: true + +require 'spec_helper' + +describe GitlabSchema.types['MilestoneStats'] do + it { expect(described_class).to require_graphql_authorizations(:read_milestone) } + + it 'has the expected fields' do + expected_fields = %w[ + total_issues_count closed_issues_count + ] + + expect(described_class).to include_graphql_fields(*expected_fields) + end +end diff --git a/spec/graphql/types/milestone_type_spec.rb b/spec/graphql/types/milestone_type_spec.rb index 8952d9265d5..2315c10433b 100644 --- a/spec/graphql/types/milestone_type_spec.rb +++ b/spec/graphql/types/milestone_type_spec.rb @@ -6,4 +6,21 @@ RSpec.describe GitlabSchema.types['Milestone'] do specify { expect(described_class.graphql_name).to eq('Milestone') } specify { expect(described_class).to require_graphql_authorizations(:read_milestone) } + + it 'has the expected fields' do + expected_fields = %w[ + id title description state web_path + due_date start_date created_at updated_at + project_milestone group_milestone subgroup_milestone + stats + ] + + expect(described_class).to have_graphql_fields(*expected_fields) + end + + describe 'stats field' do + subject { described_class.fields['stats'] } + + it { is_expected.to have_graphql_type(Types::MilestoneStatsType) } + end end diff --git a/spec/lib/gitlab/ci/build/releaser_spec.rb b/spec/lib/gitlab/ci/build/releaser_spec.rb index b338cd3a2d2..8c29c08db78 100644 --- a/spec/lib/gitlab/ci/build/releaser_spec.rb +++ b/spec/lib/gitlab/ci/build/releaser_spec.rb @@ -13,13 +13,15 @@ describe Gitlab::Ci::Build::Releaser do name: 'Release $CI_COMMIT_SHA', description: 'Created using the release-cli $EXTRA_DESCRIPTION', tag_name: 'release-$CI_COMMIT_SHA', - ref: '$CI_COMMIT_SHA' + ref: '$CI_COMMIT_SHA', + milestones: %w[m1 m2 m3], + released_at: '2020-07-15T08:00:00Z' } } end it 'generates the script' do - expect(subject).to eq(['release-cli create --name "Release $CI_COMMIT_SHA" --description "Created using the release-cli $EXTRA_DESCRIPTION" --tag-name "release-$CI_COMMIT_SHA" --ref "$CI_COMMIT_SHA"']) + expect(subject).to eq(['release-cli create --name "Release $CI_COMMIT_SHA" --description "Created using the release-cli $EXTRA_DESCRIPTION" --tag-name "release-$CI_COMMIT_SHA" --ref "$CI_COMMIT_SHA" --released-at "2020-07-15T08:00:00Z" --milestone "m1" --milestone "m2" --milestone "m3"']) end end @@ -27,10 +29,12 @@ describe Gitlab::Ci::Build::Releaser do using RSpec::Parameterized::TableSyntax where(:node_name, :node_value, :result) do - 'name' | 'Release $CI_COMMIT_SHA' | 'release-cli create --name "Release $CI_COMMIT_SHA"' - 'description' | 'Release-cli $EXTRA_DESCRIPTION' | 'release-cli create --description "Release-cli $EXTRA_DESCRIPTION"' - 'tag_name' | 'release-$CI_COMMIT_SHA' | 'release-cli create --tag-name "release-$CI_COMMIT_SHA"' - 'ref' | '$CI_COMMIT_SHA' | 'release-cli create --ref "$CI_COMMIT_SHA"' + :name | 'Release $CI_COMMIT_SHA' | 'release-cli create --name "Release $CI_COMMIT_SHA"' + :description | 'Release-cli $EXTRA_DESCRIPTION' | 'release-cli create --description "Release-cli $EXTRA_DESCRIPTION"' + :tag_name | 'release-$CI_COMMIT_SHA' | 'release-cli create --tag-name "release-$CI_COMMIT_SHA"' + :ref | '$CI_COMMIT_SHA' | 'release-cli create --ref "$CI_COMMIT_SHA"' + :milestones | %w[m1 m2 m3] | 'release-cli create --milestone "m1" --milestone "m2" --milestone "m3"' + :released_at | '2020-07-15T08:00:00Z' | 'release-cli create --released-at "2020-07-15T08:00:00Z"' end with_them do diff --git a/spec/lib/gitlab/ci/config/entry/release_spec.rb b/spec/lib/gitlab/ci/config/entry/release_spec.rb index 1559a7467b3..790ed160d15 100644 --- a/spec/lib/gitlab/ci/config/entry/release_spec.rb +++ b/spec/lib/gitlab/ci/config/entry/release_spec.rb @@ -5,21 +5,32 @@ require 'spec_helper' RSpec.describe Gitlab::Ci::Config::Entry::Release do let(:entry) { described_class.new(config) } + shared_examples_for 'a valid entry' do + describe '#value' do + it 'returns release configuration' do + expect(entry.value).to eq config + end + end + + describe '#valid?' do + it 'is valid' do + expect(entry).to be_valid + end + end + end + + shared_examples_for 'reports error' do |message| + it 'reports error' do + expect(entry.errors) + .to include message + end + end + describe 'validation' do context 'when entry config value is correct' do let(:config) { { tag_name: 'v0.06', description: "./release_changelog.txt" } } - describe '#value' do - it 'returns release configuration' do - expect(entry.value).to eq config - end - end - - describe '#valid?' do - it 'is valid' do - expect(entry).to be_valid - end - end + it_behaves_like 'a valid entry' end context "when value includes 'assets' keyword" do @@ -36,38 +47,116 @@ RSpec.describe Gitlab::Ci::Config::Entry::Release do } end - describe '#value' do - it 'returns release configuration' do - expect(entry.value).to eq config - end + it_behaves_like 'a valid entry' + end + + context "when value includes 'name' keyword" do + let(:config) do + { + tag_name: 'v0.06', + description: "./release_changelog.txt", + name: "Release $CI_TAG_NAME" + } end - describe '#valid?' do - it 'is valid' do - expect(entry).to be_valid - end + it_behaves_like 'a valid entry' + end + + context "when value includes 'ref' keyword" do + let(:config) do + { + tag_name: 'v0.06', + description: "./release_changelog.txt", + name: "Release $CI_TAG_NAME", + ref: 'b3235930aa443112e639f941c69c578912189bdd' + } end + + it_behaves_like 'a valid entry' end - context "when value includes 'name' keyword" do + context "when value includes 'released_at' keyword" do let(:config) do { tag_name: 'v0.06', description: "./release_changelog.txt", - name: "Release $CI_TAG_NAME" + name: "Release $CI_TAG_NAME", + released_at: '2019-03-15T08:00:00Z' } end - describe '#value' do - it 'returns release configuration' do - expect(entry.value).to eq config - end + it_behaves_like 'a valid entry' + end + + context "when value includes 'milestones' keyword" do + let(:config) do + { + tag_name: 'v0.06', + description: "./release_changelog.txt", + name: "Release $CI_TAG_NAME", + milestones: milestones + } end - describe '#valid?' do - it 'is valid' do - expect(entry).to be_valid - end + context 'for an array of milestones' do + let(:milestones) { %w[m1 m2 m3] } + + it_behaves_like 'a valid entry' + end + + context 'for a single milestone' do + let(:milestones) { 'm1' } + + it_behaves_like 'a valid entry' + end + end + + context "when value includes 'ref' keyword" do + let(:config) do + { + tag_name: 'v0.06', + description: "./release_changelog.txt", + name: "Release $CI_TAG_NAME", + ref: 'b3235930aa443112e639f941c69c578912189bdd' + } + end + + it_behaves_like 'a valid entry' + end + + context "when value includes 'released_at' keyword" do + let(:config) do + { + tag_name: 'v0.06', + description: "./release_changelog.txt", + name: "Release $CI_TAG_NAME", + released_at: '2019-03-15T08:00:00Z' + } + end + + it_behaves_like 'a valid entry' + end + + context "when value includes 'milestones' keyword" do + let(:config) do + { + tag_name: 'v0.06', + description: "./release_changelog.txt", + name: "Release $CI_TAG_NAME", + milestones: milestones + } + end + + context 'for an array of milestones' do + let(:milestones) { %w[m1 m2 m3] } + + it_behaves_like 'a valid entry' + end + + context 'for a single milestone' do + let(:milestones) { 'm1' } + + it_behaves_like 'a valid entry' end end @@ -76,37 +165,61 @@ RSpec.describe Gitlab::Ci::Config::Entry::Release do context 'when value of attribute is invalid' do let(:config) { { description: 10 } } - it 'reports error' do - expect(entry.errors) - .to include 'release description should be a string' - end + it_behaves_like 'reports error', 'release description should be a string' end context 'when release description is missing' do let(:config) { { tag_name: 'v0.06' } } - it 'reports error' do - expect(entry.errors) - .to include "release description can't be blank" - end + it_behaves_like 'reports error', "release description can't be blank" end context 'when release tag_name is missing' do let(:config) { { description: "./release_changelog.txt" } } - it 'reports error' do - expect(entry.errors) - .to include "release tag name can't be blank" - end + it_behaves_like 'reports error', "release tag name can't be blank" end context 'when there is an unknown key present' do let(:config) { { test: 100 } } - it 'reports error' do - expect(entry.errors) - .to include 'release config contains unknown keys: test' - end + it_behaves_like 'reports error', 'release config contains unknown keys: test' + end + + context 'when `released_at` is not a valid date' do + let(:config) { { released_at: 'ABC123' } } + + it_behaves_like 'reports error', 'release released at must be a valid datetime' + end + + context 'when `ref` is not valid' do + let(:config) { { ref: 'ABC123' } } + + it_behaves_like 'reports error', 'release ref must be a valid ref' + end + + context 'when `milestones` is not an array of strings' do + let(:config) { { milestones: [1, 2, 3] } } + + it_behaves_like 'reports error', 'release milestones should be an array of strings or a string' + end + + context 'when `released_at` is not a valid date' do + let(:config) { { released_at: 'ABC123' } } + + it_behaves_like 'reports error', 'release released at must be a valid datetime' + end + + context 'when `ref` is not valid' do + let(:config) { { ref: 'ABC123' } } + + it_behaves_like 'reports error', 'release ref must be a valid ref' + end + + context 'when `milestones` is not an array of strings' do + let(:config) { { milestones: [1, 2, 3] } } + + it_behaves_like 'reports error', 'release milestones should be an array of strings or a string' end end end diff --git a/spec/lib/gitlab/ci/yaml_processor_spec.rb b/spec/lib/gitlab/ci/yaml_processor_spec.rb index 1668149d8f5..07f3bd0917d 100644 --- a/spec/lib/gitlab/ci/yaml_processor_spec.rb +++ b/spec/lib/gitlab/ci/yaml_processor_spec.rb @@ -1397,6 +1397,9 @@ module Gitlab tag_name: "$CI_COMMIT_TAG", name: "Release $CI_TAG_NAME", description: "./release_changelog.txt", + ref: 'b3235930aa443112e639f941c69c578912189bdd', + released_at: '2019-03-15T08:00:00Z', + milestones: %w[m1 m2 m3], assets: { links: [ { diff --git a/spec/lib/gitlab/diff/stats_cache_spec.rb b/spec/lib/gitlab/diff/stats_cache_spec.rb new file mode 100644 index 00000000000..1de6fa0aab4 --- /dev/null +++ b/spec/lib/gitlab/diff/stats_cache_spec.rb @@ -0,0 +1,84 @@ +# frozen_string_literal: true + +require 'spec_helper' + +describe Gitlab::Diff::StatsCache, :use_clean_rails_memory_store_caching do + subject(:stats_cache) { described_class.new(cachable_key: cachable_key) } + + let(:key) { ['diff_stats', cachable_key, described_class::VERSION].join(":") } + let(:cachable_key) { 'cachecachecache' } + let(:stat) { Gitaly::DiffStats.new(path: 'temp', additions: 10, deletions: 15) } + let(:stats) { Gitlab::Git::DiffStatsCollection.new([stat]) } + let(:cache) { Rails.cache } + + describe '#read' do + before do + stats_cache.write_if_empty(stats) + end + + it 'returns the expected stats' do + expect(stats_cache.read.to_json).to eq(stats.to_json) + end + end + + describe '#write_if_empty' do + context 'when the cache already exists' do + before do + Rails.cache.write(key, true) + end + + it 'does not write the stats' do + expect(cache).not_to receive(:write) + + stats_cache.write_if_empty(stats) + end + end + + context 'when the cache does not exist' do + it 'writes the stats' do + expect(cache) + .to receive(:write) + .with(key, stats.as_json, expires_in: described_class::EXPIRATION) + .and_call_original + + stats_cache.write_if_empty(stats) + + expect(stats_cache.read.to_a).to eq(stats.to_a) + end + + context 'when given non utf-8 characters' do + let(:non_utf8_path) { '你好'.b } + let(:stat) { Gitaly::DiffStats.new(path: non_utf8_path, additions: 10, deletions: 15) } + + it 'writes the stats' do + expect(cache) + .to receive(:write) + .with(key, stats.as_json, expires_in: described_class::EXPIRATION) + .and_call_original + + stats_cache.write_if_empty(stats) + + expect(stats_cache.read.to_a).to eq(stats.to_a) + end + end + + context 'when given empty stats' do + let(:stats) { nil } + + it 'does not write the stats' do + expect(cache).not_to receive(:write) + + stats_cache.write_if_empty(stats) + end + end + end + end + + describe '#clear' do + it 'clears cache' do + expect(cache).to receive(:delete).with(key) + + stats_cache.clear + end + end +end diff --git a/spec/lib/gitlab/git/diff_stats_collection_spec.rb b/spec/lib/gitlab/git/diff_stats_collection_spec.rb index 82d15a49062..46bff68e12a 100644 --- a/spec/lib/gitlab/git/diff_stats_collection_spec.rb +++ b/spec/lib/gitlab/git/diff_stats_collection_spec.rb @@ -4,11 +4,11 @@ require "spec_helper" describe Gitlab::Git::DiffStatsCollection do let(:stats_a) do - double(Gitaly::DiffStats, additions: 10, deletions: 15, path: 'foo') + Gitaly::DiffStats.new(additions: 10, deletions: 15, path: 'foo') end let(:stats_b) do - double(Gitaly::DiffStats, additions: 5, deletions: 1, path: 'bar') + Gitaly::DiffStats.new(additions: 5, deletions: 1, path: 'bar') end let(:diff_stats) { [stats_a, stats_b] } diff --git a/spec/requests/api/graphql/group/milestones_spec.rb b/spec/requests/api/graphql/group/milestones_spec.rb index e85adeb4690..1c884335da1 100644 --- a/spec/requests/api/graphql/group/milestones_spec.rb +++ b/spec/requests/api/graphql/group/milestones_spec.rb @@ -7,16 +7,17 @@ RSpec.describe 'Milestones through GroupQuery' do let_it_be(:user) { create(:user) } let_it_be(:now) { Time.now } - let_it_be(:group) { create(:group) } - let_it_be(:milestone_1) { create(:milestone, group: group) } - let_it_be(:milestone_2) { create(:milestone, group: group, state: :closed, start_date: now, due_date: now + 1.day) } - let_it_be(:milestone_3) { create(:milestone, group: group, start_date: now, due_date: now + 2.days) } - let_it_be(:milestone_4) { create(:milestone, group: group, state: :closed, start_date: now - 2.days, due_date: now - 1.day) } - let_it_be(:milestone_from_other_group) { create(:milestone, group: create(:group)) } - - let(:milestone_data) { graphql_data['group']['milestones']['edges'] } describe 'Get list of milestones from a group' do + let_it_be(:group) { create(:group) } + let_it_be(:milestone_1) { create(:milestone, group: group) } + let_it_be(:milestone_2) { create(:milestone, group: group, state: :closed, start_date: now, due_date: now + 1.day) } + let_it_be(:milestone_3) { create(:milestone, group: group, start_date: now, due_date: now + 2.days) } + let_it_be(:milestone_4) { create(:milestone, group: group, state: :closed, start_date: now - 2.days, due_date: now - 1.day) } + let_it_be(:milestone_from_other_group) { create(:milestone, group: create(:group)) } + + let(:milestone_data) { graphql_data['group']['milestones']['edges'] } + context 'when the request is correct' do before do fetch_milestones(user) @@ -120,4 +121,89 @@ RSpec.describe 'Milestones through GroupQuery' do node_array(milestone_data, extract_attribute) end end + + describe 'ensures each field returns the correct value' do + let_it_be(:group) { create(:group) } + let_it_be(:project) { create(:project, group: group) } + let_it_be(:milestone) { create(:milestone, group: group, start_date: now, due_date: now + 1.day) } + let_it_be(:open_issue) { create(:issue, project: project, milestone: milestone) } + let_it_be(:closed_issue) { create(:issue, :closed, project: project, milestone: milestone) } + + let(:milestone_query) do + %{ + id + title + description + state + webPath + dueDate + startDate + createdAt + updatedAt + projectMilestone + groupMilestone + subgroupMilestone + } + end + + def post_query + full_query = graphql_query_for("group", + { full_path: group.full_path }, + [query_graphql_field("milestones", nil, "nodes { #{milestone_query} }")] + ) + + post_graphql(full_query, current_user: user) + + graphql_data.dig('group', 'milestones', 'nodes', 0) + end + + it 'returns correct values for scalar fields' do + expect(post_query).to eq({ + 'id' => global_id_of(milestone), + 'title' => milestone.title, + 'description' => milestone.description, + 'state' => 'active', + 'webPath' => milestone_path(milestone), + 'dueDate' => milestone.due_date.iso8601, + 'startDate' => milestone.start_date.iso8601, + 'createdAt' => milestone.created_at.iso8601, + 'updatedAt' => milestone.updated_at.iso8601, + 'projectMilestone' => false, + 'groupMilestone' => true, + 'subgroupMilestone' => false + }) + end + + context 'milestone statistics' do + let(:milestone_query) do + %{ + stats { + totalIssuesCount + closedIssuesCount + } + } + end + + it 'returns the correct milestone statistics' do + expect(post_query).to eq({ + 'stats' => { + 'totalIssuesCount' => 2, + 'closedIssuesCount' => 1 + } + }) + end + + context 'when the graphql_milestone_stats feature flag is disabled' do + before do + stub_feature_flags(graphql_milestone_stats: false) + end + + it 'returns nil for the stats field' do + expect(post_query).to eq({ + 'stats' => nil + }) + end + end + end + end end diff --git a/spec/requests/api/runner_spec.rb b/spec/requests/api/runner_spec.rb index c7d068a1a78..c977908149c 100644 --- a/spec/requests/api/runner_spec.rb +++ b/spec/requests/api/runner_spec.rb @@ -668,7 +668,7 @@ RSpec.describe API::Runner, :clean_gitlab_redis_shared_state do { "name" => "release", "script" => - ["release-cli create --ref \"$CI_COMMIT_SHA\" --name \"Release $CI_COMMIT_SHA\" --tag-name \"release-$CI_COMMIT_SHA\" --description \"Created using the release-cli $EXTRA_DESCRIPTION\""], + ["release-cli create --name \"Release $CI_COMMIT_SHA\" --description \"Created using the release-cli $EXTRA_DESCRIPTION\" --tag-name \"release-$CI_COMMIT_SHA\" --ref \"$CI_COMMIT_SHA\""], "timeout" => 3600, "when" => "on_success", "allow_failure" => false diff --git a/spec/services/design_management/generate_image_versions_service_spec.rb b/spec/services/design_management/generate_image_versions_service_spec.rb index cd021c8d7d3..631eec97e5a 100644 --- a/spec/services/design_management/generate_image_versions_service_spec.rb +++ b/spec/services/design_management/generate_image_versions_service_spec.rb @@ -2,7 +2,7 @@ require 'spec_helper' -describe DesignManagement::GenerateImageVersionsService do +RSpec.describe DesignManagement::GenerateImageVersionsService do let_it_be(:project) { create(:project) } let_it_be(:issue) { create(:issue, project: project) } let_it_be(:version) { create(:design, :with_lfs_file, issue: issue).versions.first } diff --git a/spec/services/design_management/save_designs_service_spec.rb b/spec/services/design_management/save_designs_service_spec.rb index 3be3ac9daca..24639632566 100644 --- a/spec/services/design_management/save_designs_service_spec.rb +++ b/spec/services/design_management/save_designs_service_spec.rb @@ -1,7 +1,7 @@ # frozen_string_literal: true require 'spec_helper' -describe DesignManagement::SaveDesignsService do +RSpec.describe DesignManagement::SaveDesignsService do include DesignManagementTestHelpers include ConcurrentHelpers diff --git a/spec/services/discussions/capture_diff_note_position_service_spec.rb b/spec/services/discussions/capture_diff_note_position_service_spec.rb index bc71e170e92..0913ddd8ef2 100644 --- a/spec/services/discussions/capture_diff_note_position_service_spec.rb +++ b/spec/services/discussions/capture_diff_note_position_service_spec.rb @@ -2,7 +2,7 @@ require 'spec_helper' -describe Discussions::CaptureDiffNotePositionService do +RSpec.describe Discussions::CaptureDiffNotePositionService do subject { described_class.new(note.noteable, paths) } context 'image note on diff' do diff --git a/spec/services/discussions/capture_diff_note_positions_service_spec.rb b/spec/services/discussions/capture_diff_note_positions_service_spec.rb index 7b1e207f3eb..dede5a4c354 100644 --- a/spec/services/discussions/capture_diff_note_positions_service_spec.rb +++ b/spec/services/discussions/capture_diff_note_positions_service_spec.rb @@ -2,7 +2,7 @@ require 'spec_helper' -describe Discussions::CaptureDiffNotePositionsService do +RSpec.describe Discussions::CaptureDiffNotePositionsService do context 'when merge request has a discussion' do let(:source_branch) { 'compare-with-merge-head-source' } let(:target_branch) { 'compare-with-merge-head-target' } diff --git a/spec/services/discussions/resolve_service_spec.rb b/spec/services/discussions/resolve_service_spec.rb index 7461934b455..5ff0d535b46 100644 --- a/spec/services/discussions/resolve_service_spec.rb +++ b/spec/services/discussions/resolve_service_spec.rb @@ -2,7 +2,7 @@ require 'spec_helper' -describe Discussions::ResolveService do +RSpec.describe Discussions::ResolveService do describe '#execute' do let_it_be(:project) { create(:project, :repository) } let_it_be(:user) { create(:user, developer_projects: [project]) } diff --git a/spec/services/discussions/update_diff_position_service_spec.rb b/spec/services/discussions/update_diff_position_service_spec.rb index 60ec83e9062..85020e95c83 100644 --- a/spec/services/discussions/update_diff_position_service_spec.rb +++ b/spec/services/discussions/update_diff_position_service_spec.rb @@ -2,7 +2,7 @@ require 'spec_helper' -describe Discussions::UpdateDiffPositionService do +RSpec.describe Discussions::UpdateDiffPositionService do let(:project) { create(:project, :repository) } let(:current_user) { project.owner } let(:create_commit) { project.commit("913c66a37b4a45b9769037c55c2d238bd0942d2e") } diff --git a/spec/services/draft_notes/create_service_spec.rb b/spec/services/draft_notes/create_service_spec.rb index 8f244ed386b..f0291067777 100644 --- a/spec/services/draft_notes/create_service_spec.rb +++ b/spec/services/draft_notes/create_service_spec.rb @@ -1,7 +1,7 @@ # frozen_string_literal: true require 'spec_helper' -describe DraftNotes::CreateService do +RSpec.describe DraftNotes::CreateService do let(:merge_request) { create(:merge_request) } let(:project) { merge_request.target_project } let(:user) { merge_request.author } diff --git a/spec/services/draft_notes/destroy_service_spec.rb b/spec/services/draft_notes/destroy_service_spec.rb index d0bf88dcdbe..f725f08f3c7 100644 --- a/spec/services/draft_notes/destroy_service_spec.rb +++ b/spec/services/draft_notes/destroy_service_spec.rb @@ -1,7 +1,7 @@ # frozen_string_literal: true require 'spec_helper' -describe DraftNotes::DestroyService do +RSpec.describe DraftNotes::DestroyService do let(:merge_request) { create(:merge_request) } let(:project) { merge_request.target_project } let(:user) { merge_request.author } diff --git a/spec/services/draft_notes/publish_service_spec.rb b/spec/services/draft_notes/publish_service_spec.rb index 4ebae2f9aa2..0dd399012ce 100644 --- a/spec/services/draft_notes/publish_service_spec.rb +++ b/spec/services/draft_notes/publish_service_spec.rb @@ -1,7 +1,7 @@ # frozen_string_literal: true require 'spec_helper' -describe DraftNotes::PublishService do +RSpec.describe DraftNotes::PublishService do include RepoHelpers let(:merge_request) { create(:merge_request) } diff --git a/spec/services/emails/confirm_service_spec.rb b/spec/services/emails/confirm_service_spec.rb index 973d2731b2f..935a673f548 100644 --- a/spec/services/emails/confirm_service_spec.rb +++ b/spec/services/emails/confirm_service_spec.rb @@ -2,7 +2,7 @@ require 'spec_helper' -describe Emails::ConfirmService do +RSpec.describe Emails::ConfirmService do let(:user) { create(:user) } subject(:service) { described_class.new(user) } diff --git a/spec/services/emails/create_service_spec.rb b/spec/services/emails/create_service_spec.rb index 23c2f53dca0..1396a1fce30 100644 --- a/spec/services/emails/create_service_spec.rb +++ b/spec/services/emails/create_service_spec.rb @@ -2,7 +2,7 @@ require 'spec_helper' -describe Emails::CreateService do +RSpec.describe Emails::CreateService do let(:user) { create(:user) } let(:opts) { { email: 'new@email.com', user: user } } diff --git a/spec/services/emails/destroy_service_spec.rb b/spec/services/emails/destroy_service_spec.rb index 9e14a13aa4f..f8407be41e7 100644 --- a/spec/services/emails/destroy_service_spec.rb +++ b/spec/services/emails/destroy_service_spec.rb @@ -2,7 +2,7 @@ require 'spec_helper' -describe Emails::DestroyService do +RSpec.describe Emails::DestroyService do let!(:user) { create(:user) } let!(:email) { create(:email, user: user) } diff --git a/spec/services/environments/auto_stop_service_spec.rb b/spec/services/environments/auto_stop_service_spec.rb index b34d15889d3..8e56c7e642c 100644 --- a/spec/services/environments/auto_stop_service_spec.rb +++ b/spec/services/environments/auto_stop_service_spec.rb @@ -2,7 +2,7 @@ require 'spec_helper' -describe Environments::AutoStopService, :clean_gitlab_redis_shared_state do +RSpec.describe Environments::AutoStopService, :clean_gitlab_redis_shared_state do include CreateEnvironmentsHelpers include ExclusiveLeaseHelpers diff --git a/spec/services/environments/reset_auto_stop_service_spec.rb b/spec/services/environments/reset_auto_stop_service_spec.rb index 53a20dd906e..cab1bf2cc26 100644 --- a/spec/services/environments/reset_auto_stop_service_spec.rb +++ b/spec/services/environments/reset_auto_stop_service_spec.rb @@ -2,7 +2,7 @@ require 'spec_helper' -describe Environments::ResetAutoStopService do +RSpec.describe Environments::ResetAutoStopService do let_it_be(:project) { create(:project) } let_it_be(:developer) { create(:user).tap { |user| project.add_developer(user) } } let_it_be(:reporter) { create(:user).tap { |user| project.add_reporter(user) } } diff --git a/spec/services/error_tracking/base_service_spec.rb b/spec/services/error_tracking/base_service_spec.rb index 68deb2e2a73..ffbda37d417 100644 --- a/spec/services/error_tracking/base_service_spec.rb +++ b/spec/services/error_tracking/base_service_spec.rb @@ -2,7 +2,7 @@ require 'spec_helper' -describe ErrorTracking::BaseService do +RSpec.describe ErrorTracking::BaseService do describe '#compose_response' do let(:project) { double('project') } let(:user) { double('user') } diff --git a/spec/services/error_tracking/issue_details_service_spec.rb b/spec/services/error_tracking/issue_details_service_spec.rb index 66b8988f8e3..1954640a512 100644 --- a/spec/services/error_tracking/issue_details_service_spec.rb +++ b/spec/services/error_tracking/issue_details_service_spec.rb @@ -2,7 +2,7 @@ require 'spec_helper' -describe ErrorTracking::IssueDetailsService do +RSpec.describe ErrorTracking::IssueDetailsService do include_context 'sentry error tracking context' subject { described_class.new(project, user, params) } diff --git a/spec/services/error_tracking/issue_latest_event_service_spec.rb b/spec/services/error_tracking/issue_latest_event_service_spec.rb index 078d7511850..b7560762ae4 100644 --- a/spec/services/error_tracking/issue_latest_event_service_spec.rb +++ b/spec/services/error_tracking/issue_latest_event_service_spec.rb @@ -2,7 +2,7 @@ require 'spec_helper' -describe ErrorTracking::IssueLatestEventService do +RSpec.describe ErrorTracking::IssueLatestEventService do include_context 'sentry error tracking context' subject { described_class.new(project, user) } diff --git a/spec/services/error_tracking/issue_update_service_spec.rb b/spec/services/error_tracking/issue_update_service_spec.rb index a13d42ec141..9ed24038ed8 100644 --- a/spec/services/error_tracking/issue_update_service_spec.rb +++ b/spec/services/error_tracking/issue_update_service_spec.rb @@ -2,7 +2,7 @@ require 'spec_helper' -describe ErrorTracking::IssueUpdateService do +RSpec.describe ErrorTracking::IssueUpdateService do include_context 'sentry error tracking context' let(:arguments) { { issue_id: non_existing_record_id, status: 'resolved' } } diff --git a/spec/services/error_tracking/list_issues_service_spec.rb b/spec/services/error_tracking/list_issues_service_spec.rb index 5f6e071e10d..518f2a80826 100644 --- a/spec/services/error_tracking/list_issues_service_spec.rb +++ b/spec/services/error_tracking/list_issues_service_spec.rb @@ -2,7 +2,7 @@ require 'spec_helper' -describe ErrorTracking::ListIssuesService do +RSpec.describe ErrorTracking::ListIssuesService do include_context 'sentry error tracking context' let(:params) { { search_term: 'something', sort: 'last_seen', cursor: 'some-cursor' } } diff --git a/spec/services/error_tracking/list_projects_service_spec.rb b/spec/services/error_tracking/list_projects_service_spec.rb index 565610c64ac..8bc632349fa 100644 --- a/spec/services/error_tracking/list_projects_service_spec.rb +++ b/spec/services/error_tracking/list_projects_service_spec.rb @@ -2,7 +2,7 @@ require 'spec_helper' -describe ErrorTracking::ListProjectsService do +RSpec.describe ErrorTracking::ListProjectsService do let_it_be(:user) { create(:user) } let_it_be(:project, reload: true) { create(:project) } diff --git a/spec/services/event_create_service_spec.rb b/spec/services/event_create_service_spec.rb index d23d34e2951..6a9d8857b32 100644 --- a/spec/services/event_create_service_spec.rb +++ b/spec/services/event_create_service_spec.rb @@ -2,7 +2,7 @@ require 'spec_helper' -describe EventCreateService do +RSpec.describe EventCreateService do let(:service) { described_class.new } let_it_be(:user, reload: true) { create :user } diff --git a/spec/services/events/render_service_spec.rb b/spec/services/events/render_service_spec.rb index a623a05a56d..24a3b9abe14 100644 --- a/spec/services/events/render_service_spec.rb +++ b/spec/services/events/render_service_spec.rb @@ -2,7 +2,7 @@ require 'spec_helper' -describe Events::RenderService do +RSpec.describe Events::RenderService do describe '#execute' do let!(:note) { build(:note) } let!(:event) { build(:event, target: note, project: note.project) } diff --git a/spec/services/files/create_service_spec.rb b/spec/services/files/create_service_spec.rb index 195f56a2909..3b3dbd1fcfe 100644 --- a/spec/services/files/create_service_spec.rb +++ b/spec/services/files/create_service_spec.rb @@ -2,7 +2,7 @@ require "spec_helper" -describe Files::CreateService do +RSpec.describe Files::CreateService do let(:project) { create(:project, :repository) } let(:repository) { project.repository } let(:user) { create(:user, :commit_email) } diff --git a/spec/services/files/delete_service_spec.rb b/spec/services/files/delete_service_spec.rb index b849def06fc..17e4645fde6 100644 --- a/spec/services/files/delete_service_spec.rb +++ b/spec/services/files/delete_service_spec.rb @@ -2,7 +2,7 @@ require "spec_helper" -describe Files::DeleteService do +RSpec.describe Files::DeleteService do subject { described_class.new(project, user, commit_params) } let(:project) { create(:project, :repository) } diff --git a/spec/services/files/multi_service_spec.rb b/spec/services/files/multi_service_spec.rb index 0f51c72019e..6a5c7d2749d 100644 --- a/spec/services/files/multi_service_spec.rb +++ b/spec/services/files/multi_service_spec.rb @@ -2,7 +2,7 @@ require "spec_helper" -describe Files::MultiService do +RSpec.describe Files::MultiService do subject { described_class.new(project, user, commit_params) } let(:project) { create(:project, :repository) } diff --git a/spec/services/files/update_service_spec.rb b/spec/services/files/update_service_spec.rb index 37869b176ef..84d78b4c2bc 100644 --- a/spec/services/files/update_service_spec.rb +++ b/spec/services/files/update_service_spec.rb @@ -2,7 +2,7 @@ require "spec_helper" -describe Files::UpdateService do +RSpec.describe Files::UpdateService do subject { described_class.new(project, user, commit_params) } let(:project) { create(:project, :repository) } diff --git a/spec/services/git/base_hooks_service_spec.rb b/spec/services/git/base_hooks_service_spec.rb index 07ce560bd88..661c77b56bb 100644 --- a/spec/services/git/base_hooks_service_spec.rb +++ b/spec/services/git/base_hooks_service_spec.rb @@ -2,7 +2,7 @@ require 'spec_helper' -describe Git::BaseHooksService do +RSpec.describe Git::BaseHooksService do include RepoHelpers include GitHelpers diff --git a/spec/services/git/branch_hooks_service_spec.rb b/spec/services/git/branch_hooks_service_spec.rb index 908b9772c40..7f22af8bfc6 100644 --- a/spec/services/git/branch_hooks_service_spec.rb +++ b/spec/services/git/branch_hooks_service_spec.rb @@ -2,7 +2,7 @@ require 'spec_helper' -describe Git::BranchHooksService do +RSpec.describe Git::BranchHooksService do include RepoHelpers include ProjectForksHelper diff --git a/spec/services/git/branch_push_service_spec.rb b/spec/services/git/branch_push_service_spec.rb index 6ecc1a62ff3..5499e9f21d6 100644 --- a/spec/services/git/branch_push_service_spec.rb +++ b/spec/services/git/branch_push_service_spec.rb @@ -2,7 +2,7 @@ require 'spec_helper' -describe Git::BranchPushService, services: true do +RSpec.describe Git::BranchPushService, services: true do include RepoHelpers let_it_be(:user) { create(:user) } diff --git a/spec/services/git/process_ref_changes_service_spec.rb b/spec/services/git/process_ref_changes_service_spec.rb index 924e913a9ec..c2fb40a0ed0 100644 --- a/spec/services/git/process_ref_changes_service_spec.rb +++ b/spec/services/git/process_ref_changes_service_spec.rb @@ -2,7 +2,7 @@ require 'spec_helper' -describe Git::ProcessRefChangesService do +RSpec.describe Git::ProcessRefChangesService do let(:project) { create(:project, :repository) } let(:user) { project.owner } let(:params) { { changes: git_changes } } diff --git a/spec/services/git/tag_hooks_service_spec.rb b/spec/services/git/tag_hooks_service_spec.rb index 094ccd8c9f0..4443c46a414 100644 --- a/spec/services/git/tag_hooks_service_spec.rb +++ b/spec/services/git/tag_hooks_service_spec.rb @@ -2,7 +2,7 @@ require 'spec_helper' -describe Git::TagHooksService, :service do +RSpec.describe Git::TagHooksService, :service do let(:user) { create(:user) } let(:project) { create(:project, :repository) } diff --git a/spec/services/git/tag_push_service_spec.rb b/spec/services/git/tag_push_service_spec.rb index 9688041c08c..d0673a10faa 100644 --- a/spec/services/git/tag_push_service_spec.rb +++ b/spec/services/git/tag_push_service_spec.rb @@ -2,7 +2,7 @@ require 'spec_helper' -describe Git::TagPushService do +RSpec.describe Git::TagPushService do include RepoHelpers include GitHelpers diff --git a/spec/services/git/wiki_push_service/change_spec.rb b/spec/services/git/wiki_push_service/change_spec.rb index 4da3f0fc738..3616bf62b20 100644 --- a/spec/services/git/wiki_push_service/change_spec.rb +++ b/spec/services/git/wiki_push_service/change_spec.rb @@ -2,7 +2,7 @@ require 'spec_helper' -describe Git::WikiPushService::Change do +RSpec.describe Git::WikiPushService::Change do subject { described_class.new(project_wiki, change, raw_change) } let(:project_wiki) { double('ProjectWiki') } diff --git a/spec/services/git/wiki_push_service_spec.rb b/spec/services/git/wiki_push_service_spec.rb index b2234c81c24..623949c0806 100644 --- a/spec/services/git/wiki_push_service_spec.rb +++ b/spec/services/git/wiki_push_service_spec.rb @@ -2,7 +2,7 @@ require 'spec_helper' -describe Git::WikiPushService, services: true do +RSpec.describe Git::WikiPushService, services: true do include RepoHelpers let_it_be(:key_id) { create(:key, user: current_user).shell_id } diff --git a/spec/services/gpg_keys/create_service_spec.rb b/spec/services/gpg_keys/create_service_spec.rb index 8dfc9f19439..9ac56355b4b 100644 --- a/spec/services/gpg_keys/create_service_spec.rb +++ b/spec/services/gpg_keys/create_service_spec.rb @@ -2,7 +2,7 @@ require 'spec_helper' -describe GpgKeys::CreateService do +RSpec.describe GpgKeys::CreateService do let(:user) { create(:user) } let(:params) { attributes_for(:gpg_key) } diff --git a/spec/services/grafana/proxy_service_spec.rb b/spec/services/grafana/proxy_service_spec.rb index 8cb7210524a..7ddc31d45d9 100644 --- a/spec/services/grafana/proxy_service_spec.rb +++ b/spec/services/grafana/proxy_service_spec.rb @@ -2,7 +2,7 @@ require 'spec_helper' -describe Grafana::ProxyService do +RSpec.describe Grafana::ProxyService do include ReactiveCachingHelpers let_it_be(:project) { create(:project) } diff --git a/spec/services/gravatar_service_spec.rb b/spec/services/gravatar_service_spec.rb index 9ce1df0f76f..a6418b02f78 100644 --- a/spec/services/gravatar_service_spec.rb +++ b/spec/services/gravatar_service_spec.rb @@ -2,7 +2,7 @@ require 'spec_helper' -describe GravatarService do +RSpec.describe GravatarService do describe '#execute' do let(:url) { 'http://example.com/avatar?hash=%{hash}&size=%{size}&email=%{email}&username=%{username}' } diff --git a/spec/services/groups/auto_devops_service_spec.rb b/spec/services/groups/auto_devops_service_spec.rb index 63fbdc70c1b..3d89ee96823 100644 --- a/spec/services/groups/auto_devops_service_spec.rb +++ b/spec/services/groups/auto_devops_service_spec.rb @@ -1,7 +1,7 @@ # frozen_string_literal: true require 'spec_helper' -describe Groups::AutoDevopsService, '#execute' do +RSpec.describe Groups::AutoDevopsService, '#execute' do let_it_be(:group) { create(:group) } let_it_be(:user) { create(:user) } let(:group_params) { { auto_devops_enabled: '0' } } diff --git a/spec/services/groups/create_service_spec.rb b/spec/services/groups/create_service_spec.rb index c0e876cce33..b2e9db8c9de 100644 --- a/spec/services/groups/create_service_spec.rb +++ b/spec/services/groups/create_service_spec.rb @@ -2,7 +2,7 @@ require 'spec_helper' -describe Groups::CreateService, '#execute' do +RSpec.describe Groups::CreateService, '#execute' do let!(:user) { create(:user) } let!(:group_params) { { path: "group_path", visibility_level: Gitlab::VisibilityLevel::PUBLIC } } diff --git a/spec/services/groups/deploy_tokens/create_service_spec.rb b/spec/services/groups/deploy_tokens/create_service_spec.rb index 20c609bc828..0c28075f998 100644 --- a/spec/services/groups/deploy_tokens/create_service_spec.rb +++ b/spec/services/groups/deploy_tokens/create_service_spec.rb @@ -2,7 +2,7 @@ require 'spec_helper' -describe Groups::DeployTokens::CreateService do +RSpec.describe Groups::DeployTokens::CreateService do it_behaves_like 'a deploy token creation service' do let(:entity) { create(:group) } let(:deploy_token_class) { GroupDeployToken } diff --git a/spec/services/groups/deploy_tokens/destroy_service_spec.rb b/spec/services/groups/deploy_tokens/destroy_service_spec.rb index d4ef5963558..28e60b12993 100644 --- a/spec/services/groups/deploy_tokens/destroy_service_spec.rb +++ b/spec/services/groups/deploy_tokens/destroy_service_spec.rb @@ -2,7 +2,7 @@ require 'spec_helper' -describe Groups::DeployTokens::DestroyService do +RSpec.describe Groups::DeployTokens::DestroyService do it_behaves_like 'a deploy token deletion service' do let_it_be(:entity) { create(:group) } let_it_be(:deploy_token_class) { GroupDeployToken } diff --git a/spec/services/groups/destroy_service_spec.rb b/spec/services/groups/destroy_service_spec.rb index bf639153b99..31afdba8192 100644 --- a/spec/services/groups/destroy_service_spec.rb +++ b/spec/services/groups/destroy_service_spec.rb @@ -2,7 +2,7 @@ require 'spec_helper' -describe Groups::DestroyService do +RSpec.describe Groups::DestroyService do include DatabaseConnectionHelpers let!(:user) { create(:user) } diff --git a/spec/services/groups/group_links/create_service_spec.rb b/spec/services/groups/group_links/create_service_spec.rb index 36faa69577e..bca03863d1e 100644 --- a/spec/services/groups/group_links/create_service_spec.rb +++ b/spec/services/groups/group_links/create_service_spec.rb @@ -2,7 +2,7 @@ require 'spec_helper' -describe Groups::GroupLinks::CreateService, '#execute' do +RSpec.describe Groups::GroupLinks::CreateService, '#execute' do let(:parent_group_user) { create(:user) } let(:group_user) { create(:user) } let(:child_group_user) { create(:user) } diff --git a/spec/services/groups/group_links/destroy_service_spec.rb b/spec/services/groups/group_links/destroy_service_spec.rb index 8989f024262..22fe8a1d58b 100644 --- a/spec/services/groups/group_links/destroy_service_spec.rb +++ b/spec/services/groups/group_links/destroy_service_spec.rb @@ -2,7 +2,7 @@ require 'spec_helper' -describe Groups::GroupLinks::DestroyService, '#execute' do +RSpec.describe Groups::GroupLinks::DestroyService, '#execute' do let(:user) { create(:user) } let_it_be(:group) { create(:group, :private) } diff --git a/spec/services/groups/group_links/update_service_spec.rb b/spec/services/groups/group_links/update_service_spec.rb index 446364c9799..e4ff83d7926 100644 --- a/spec/services/groups/group_links/update_service_spec.rb +++ b/spec/services/groups/group_links/update_service_spec.rb @@ -2,7 +2,7 @@ require 'spec_helper' -describe Groups::GroupLinks::UpdateService, '#execute' do +RSpec.describe Groups::GroupLinks::UpdateService, '#execute' do let(:user) { create(:user) } let_it_be(:group) { create(:group, :private) } diff --git a/spec/services/groups/import_export/export_service_spec.rb b/spec/services/groups/import_export/export_service_spec.rb index ea49b26cc7c..690bcb94556 100644 --- a/spec/services/groups/import_export/export_service_spec.rb +++ b/spec/services/groups/import_export/export_service_spec.rb @@ -2,7 +2,7 @@ require 'spec_helper' -describe Groups::ImportExport::ExportService do +RSpec.describe Groups::ImportExport::ExportService do describe '#async_execute' do let(:user) { create(:user) } let(:group) { create(:group) } diff --git a/spec/services/groups/import_export/import_service_spec.rb b/spec/services/groups/import_export/import_service_spec.rb index 1f7eaccbdbd..4aac602a6da 100644 --- a/spec/services/groups/import_export/import_service_spec.rb +++ b/spec/services/groups/import_export/import_service_spec.rb @@ -2,7 +2,7 @@ require 'spec_helper' -describe Groups::ImportExport::ImportService do +RSpec.describe Groups::ImportExport::ImportService do describe '#async_execute' do let_it_be(:user) { create(:user) } let_it_be(:group) { create(:group) } diff --git a/spec/services/groups/nested_create_service_spec.rb b/spec/services/groups/nested_create_service_spec.rb index b30392c1b12..a43c1d8d9c3 100644 --- a/spec/services/groups/nested_create_service_spec.rb +++ b/spec/services/groups/nested_create_service_spec.rb @@ -2,7 +2,7 @@ require 'spec_helper' -describe Groups::NestedCreateService do +RSpec.describe Groups::NestedCreateService do let(:user) { create(:user) } subject(:service) { described_class.new(user, params) } diff --git a/spec/services/groups/transfer_service_spec.rb b/spec/services/groups/transfer_service_spec.rb index d7f6bececfe..fa254bba6a9 100644 --- a/spec/services/groups/transfer_service_spec.rb +++ b/spec/services/groups/transfer_service_spec.rb @@ -2,7 +2,7 @@ require 'spec_helper' -describe Groups::TransferService do +RSpec.describe Groups::TransferService do let(:user) { create(:user) } let(:new_parent_group) { create(:group, :public) } let!(:group_member) { create(:group_member, :owner, group: group, user: user) } diff --git a/spec/services/groups/update_service_spec.rb b/spec/services/groups/update_service_spec.rb index b17d78505d1..25c79d9e600 100644 --- a/spec/services/groups/update_service_spec.rb +++ b/spec/services/groups/update_service_spec.rb @@ -2,7 +2,7 @@ require 'spec_helper' -describe Groups::UpdateService do +RSpec.describe Groups::UpdateService do let!(:user) { create(:user) } let!(:private_group) { create(:group, :private) } let!(:internal_group) { create(:group, :internal) } diff --git a/spec/services/import/github_service_spec.rb b/spec/services/import/github_service_spec.rb index 461b17e0e33..266ff309662 100644 --- a/spec/services/import/github_service_spec.rb +++ b/spec/services/import/github_service_spec.rb @@ -2,7 +2,7 @@ require 'spec_helper' -describe Import::GithubService do +RSpec.describe Import::GithubService do let_it_be(:user) { create(:user) } let_it_be(:token) { 'complex-token' } let_it_be(:access_params) { { github_access_token: 'github-complex-token' } } diff --git a/spec/services/import_export_clean_up_service_spec.rb b/spec/services/import_export_clean_up_service_spec.rb index 9f811f56f50..4101b13adf9 100644 --- a/spec/services/import_export_clean_up_service_spec.rb +++ b/spec/services/import_export_clean_up_service_spec.rb @@ -2,7 +2,7 @@ require 'spec_helper' -describe ImportExportCleanUpService do +RSpec.describe ImportExportCleanUpService do describe '#execute' do let(:service) { described_class.new } diff --git a/spec/services/incident_management/create_issue_service_spec.rb b/spec/services/incident_management/create_issue_service_spec.rb index 472e64db35c..b513b649a8b 100644 --- a/spec/services/incident_management/create_issue_service_spec.rb +++ b/spec/services/incident_management/create_issue_service_spec.rb @@ -2,7 +2,7 @@ require 'spec_helper' -describe IncidentManagement::CreateIssueService do +RSpec.describe IncidentManagement::CreateIssueService do let(:project) { create(:project, :repository, :private) } let_it_be(:user) { User.alert_bot } let(:service) { described_class.new(project, alert_payload) } diff --git a/spec/services/issuable/bulk_update_service_spec.rb b/spec/services/issuable/bulk_update_service_spec.rb index c791c454d70..d0192d97384 100644 --- a/spec/services/issuable/bulk_update_service_spec.rb +++ b/spec/services/issuable/bulk_update_service_spec.rb @@ -2,7 +2,7 @@ require 'spec_helper' -describe Issuable::BulkUpdateService do +RSpec.describe Issuable::BulkUpdateService do let(:user) { create(:user) } let(:project) { create(:project, :repository, namespace: user.namespace) } diff --git a/spec/services/issuable/clone/attributes_rewriter_spec.rb b/spec/services/issuable/clone/attributes_rewriter_spec.rb index fb520f828fa..372e6d480e3 100644 --- a/spec/services/issuable/clone/attributes_rewriter_spec.rb +++ b/spec/services/issuable/clone/attributes_rewriter_spec.rb @@ -2,7 +2,7 @@ require 'spec_helper' -describe Issuable::Clone::AttributesRewriter do +RSpec.describe Issuable::Clone::AttributesRewriter do let(:user) { create(:user) } let(:group) { create(:group) } let(:project1) { create(:project, :public, group: group) } diff --git a/spec/services/issuable/clone/content_rewriter_spec.rb b/spec/services/issuable/clone/content_rewriter_spec.rb index 3479c20862a..f39439b7c2f 100644 --- a/spec/services/issuable/clone/content_rewriter_spec.rb +++ b/spec/services/issuable/clone/content_rewriter_spec.rb @@ -2,7 +2,7 @@ require 'spec_helper' -describe Issuable::Clone::ContentRewriter do +RSpec.describe Issuable::Clone::ContentRewriter do let(:user) { create(:user) } let(:group) { create(:group) } let(:project1) { create(:project, :public, group: group) } diff --git a/spec/services/issuable/common_system_notes_service_spec.rb b/spec/services/issuable/common_system_notes_service_spec.rb index 771e7ca42c9..8d908061dd2 100644 --- a/spec/services/issuable/common_system_notes_service_spec.rb +++ b/spec/services/issuable/common_system_notes_service_spec.rb @@ -2,7 +2,7 @@ require 'spec_helper' -describe Issuable::CommonSystemNotesService do +RSpec.describe Issuable::CommonSystemNotesService do let_it_be(:project) { create(:project) } let_it_be(:user) { create(:user) } diff --git a/spec/services/issuable/destroy_service_spec.rb b/spec/services/issuable/destroy_service_spec.rb index dd6a966c145..8d62932f986 100644 --- a/spec/services/issuable/destroy_service_spec.rb +++ b/spec/services/issuable/destroy_service_spec.rb @@ -2,7 +2,7 @@ require 'spec_helper' -describe Issuable::DestroyService do +RSpec.describe Issuable::DestroyService do let(:user) { create(:user) } let(:project) { create(:project, :public) } diff --git a/spec/services/issues/build_service_spec.rb b/spec/services/issues/build_service_spec.rb index 140b78f9b7a..68b226b02da 100644 --- a/spec/services/issues/build_service_spec.rb +++ b/spec/services/issues/build_service_spec.rb @@ -2,7 +2,7 @@ require 'spec_helper.rb' -describe Issues::BuildService do +RSpec.describe Issues::BuildService do let(:project) { create(:project, :repository) } let(:user) { create(:user) } diff --git a/spec/services/issues/close_service_spec.rb b/spec/services/issues/close_service_spec.rb index 78eba565de4..6678d831775 100644 --- a/spec/services/issues/close_service_spec.rb +++ b/spec/services/issues/close_service_spec.rb @@ -2,7 +2,7 @@ require 'spec_helper' -describe Issues::CloseService do +RSpec.describe Issues::CloseService do let(:project) { create(:project, :repository) } let(:user) { create(:user, email: "user@example.com") } let(:user2) { create(:user, email: "user2@example.com") } diff --git a/spec/services/issues/create_service_spec.rb b/spec/services/issues/create_service_spec.rb index bb02941576a..ce6ca74a311 100644 --- a/spec/services/issues/create_service_spec.rb +++ b/spec/services/issues/create_service_spec.rb @@ -2,7 +2,7 @@ require 'spec_helper' -describe Issues::CreateService do +RSpec.describe Issues::CreateService do let(:project) { create(:project) } let(:user) { create(:user) } diff --git a/spec/services/issues/duplicate_service_spec.rb b/spec/services/issues/duplicate_service_spec.rb index 41a151b0ca1..78e030e6ac7 100644 --- a/spec/services/issues/duplicate_service_spec.rb +++ b/spec/services/issues/duplicate_service_spec.rb @@ -2,7 +2,7 @@ require 'spec_helper' -describe Issues::DuplicateService do +RSpec.describe Issues::DuplicateService do let(:user) { create(:user) } let(:canonical_project) { create(:project) } let(:duplicate_project) { create(:project) } diff --git a/spec/services/issues/export_csv_service_spec.rb b/spec/services/issues/export_csv_service_spec.rb index 419e29d92a8..76381fe525b 100644 --- a/spec/services/issues/export_csv_service_spec.rb +++ b/spec/services/issues/export_csv_service_spec.rb @@ -2,7 +2,7 @@ require 'spec_helper' -describe Issues::ExportCsvService do +RSpec.describe Issues::ExportCsvService do let_it_be(:user) { create(:user) } let(:group) { create(:group) } let(:project) { create(:project, :public, group: group) } diff --git a/spec/services/issues/import_csv_service_spec.rb b/spec/services/issues/import_csv_service_spec.rb index 92b88489af9..cc3e1d23a74 100644 --- a/spec/services/issues/import_csv_service_spec.rb +++ b/spec/services/issues/import_csv_service_spec.rb @@ -2,7 +2,7 @@ require 'spec_helper' -describe Issues::ImportCsvService do +RSpec.describe Issues::ImportCsvService do let(:project) { create(:project) } let(:user) { create(:user) } diff --git a/spec/services/issues/move_service_spec.rb b/spec/services/issues/move_service_spec.rb index a449541f459..e1d08c0cb8c 100644 --- a/spec/services/issues/move_service_spec.rb +++ b/spec/services/issues/move_service_spec.rb @@ -2,7 +2,7 @@ require 'spec_helper' -describe Issues::MoveService do +RSpec.describe Issues::MoveService do let(:user) { create(:user) } let(:author) { create(:user) } let(:title) { 'Some issue' } diff --git a/spec/services/issues/referenced_merge_requests_service_spec.rb b/spec/services/issues/referenced_merge_requests_service_spec.rb index 2c5af11d2e6..bf7a4c97e48 100644 --- a/spec/services/issues/referenced_merge_requests_service_spec.rb +++ b/spec/services/issues/referenced_merge_requests_service_spec.rb @@ -2,7 +2,7 @@ require 'spec_helper.rb' -describe Issues::ReferencedMergeRequestsService do +RSpec.describe Issues::ReferencedMergeRequestsService do def create_referencing_mr(attributes = {}) create(:merge_request, attributes).tap do |merge_request| create(:note, :system, project: project, noteable: issue, author: user, note: merge_request.to_reference(full: true)) diff --git a/spec/services/issues/related_branches_service_spec.rb b/spec/services/issues/related_branches_service_spec.rb index 9f72e499414..d79132d98db 100644 --- a/spec/services/issues/related_branches_service_spec.rb +++ b/spec/services/issues/related_branches_service_spec.rb @@ -2,7 +2,7 @@ require 'spec_helper' -describe Issues::RelatedBranchesService do +RSpec.describe Issues::RelatedBranchesService do let_it_be(:developer) { create(:user) } let_it_be(:issue) { create(:issue) } let(:user) { developer } diff --git a/spec/services/issues/reopen_service_spec.rb b/spec/services/issues/reopen_service_spec.rb index ca878ee947a..f7416203259 100644 --- a/spec/services/issues/reopen_service_spec.rb +++ b/spec/services/issues/reopen_service_spec.rb @@ -2,7 +2,7 @@ require 'spec_helper' -describe Issues::ReopenService do +RSpec.describe Issues::ReopenService do let(:project) { create(:project) } let(:issue) { create(:issue, :closed, project: project) } diff --git a/spec/services/issues/reorder_service_spec.rb b/spec/services/issues/reorder_service_spec.rb index 6d72d698b1d..b6ad488a48c 100644 --- a/spec/services/issues/reorder_service_spec.rb +++ b/spec/services/issues/reorder_service_spec.rb @@ -2,7 +2,7 @@ require 'spec_helper' -describe Issues::ReorderService do +RSpec.describe Issues::ReorderService do let_it_be(:user) { create(:user) } let_it_be(:project) { create(:project) } let_it_be(:group) { create(:group) } diff --git a/spec/services/issues/resolve_discussions_spec.rb b/spec/services/issues/resolve_discussions_spec.rb index ec6624db6fc..a541d92feb2 100644 --- a/spec/services/issues/resolve_discussions_spec.rb +++ b/spec/services/issues/resolve_discussions_spec.rb @@ -2,7 +2,7 @@ require 'spec_helper.rb' -describe Issues::ResolveDiscussions do +RSpec.describe Issues::ResolveDiscussions do let(:project) { create(:project, :repository) } let(:user) { create(:user) } diff --git a/spec/services/issues/update_service_spec.rb b/spec/services/issues/update_service_spec.rb index 33ae2682d01..64d52e35ef2 100644 --- a/spec/services/issues/update_service_spec.rb +++ b/spec/services/issues/update_service_spec.rb @@ -2,7 +2,7 @@ require 'spec_helper' -describe Issues::UpdateService, :mailer do +RSpec.describe Issues::UpdateService, :mailer do let_it_be(:user) { create(:user) } let_it_be(:user2) { create(:user) } let_it_be(:user3) { create(:user) } diff --git a/spec/services/issues/zoom_link_service_spec.rb b/spec/services/issues/zoom_link_service_spec.rb index 3fb1eae361a..56aec4fe564 100644 --- a/spec/services/issues/zoom_link_service_spec.rb +++ b/spec/services/issues/zoom_link_service_spec.rb @@ -2,7 +2,7 @@ require 'spec_helper' -describe Issues::ZoomLinkService do +RSpec.describe Issues::ZoomLinkService do let_it_be(:user) { create(:user) } let_it_be(:issue) { create(:issue) } diff --git a/spec/services/jira/requests/projects_spec.rb b/spec/services/jira/requests/projects_spec.rb index 42d09da138b..96b9c4d4779 100644 --- a/spec/services/jira/requests/projects_spec.rb +++ b/spec/services/jira/requests/projects_spec.rb @@ -2,7 +2,7 @@ require 'spec_helper' -describe Jira::Requests::Projects do +RSpec.describe Jira::Requests::Projects do let(:jira_service) { create(:jira_service) } let(:params) { {} } diff --git a/spec/services/jira_import/start_import_service_spec.rb b/spec/services/jira_import/start_import_service_spec.rb index 9dc8cdb1475..0437dd19e34 100644 --- a/spec/services/jira_import/start_import_service_spec.rb +++ b/spec/services/jira_import/start_import_service_spec.rb @@ -2,7 +2,7 @@ require 'spec_helper' -describe JiraImport::StartImportService do +RSpec.describe JiraImport::StartImportService do include JiraServiceHelper let_it_be(:user) { create(:user) } diff --git a/spec/services/jira_import/users_importer_spec.rb b/spec/services/jira_import/users_importer_spec.rb index 28ce5f1b44b..64cdc70f612 100644 --- a/spec/services/jira_import/users_importer_spec.rb +++ b/spec/services/jira_import/users_importer_spec.rb @@ -2,7 +2,7 @@ require 'spec_helper' -describe JiraImport::UsersImporter do +RSpec.describe JiraImport::UsersImporter do include JiraServiceHelper let_it_be(:user) { create(:user) } diff --git a/spec/services/jira_import/users_mapper_spec.rb b/spec/services/jira_import/users_mapper_spec.rb index 75dbc41aa2e..0fa98736b51 100644 --- a/spec/services/jira_import/users_mapper_spec.rb +++ b/spec/services/jira_import/users_mapper_spec.rb @@ -2,7 +2,7 @@ require 'spec_helper' -describe JiraImport::UsersMapper do +RSpec.describe JiraImport::UsersMapper do let_it_be(:project) { create(:project) } subject { described_class.new(project, jira_users).execute } diff --git a/spec/services/keys/create_service_spec.rb b/spec/services/keys/create_service_spec.rb index 1f8b402cf08..1dbe383ad8e 100644 --- a/spec/services/keys/create_service_spec.rb +++ b/spec/services/keys/create_service_spec.rb @@ -2,7 +2,7 @@ require 'spec_helper' -describe Keys::CreateService do +RSpec.describe Keys::CreateService do let(:user) { create(:user) } let(:params) { attributes_for(:key) } diff --git a/spec/services/keys/destroy_service_spec.rb b/spec/services/keys/destroy_service_spec.rb index ca4bbd50c03..59ce4a941c7 100644 --- a/spec/services/keys/destroy_service_spec.rb +++ b/spec/services/keys/destroy_service_spec.rb @@ -2,7 +2,7 @@ require 'spec_helper' -describe Keys::DestroyService do +RSpec.describe Keys::DestroyService do let(:user) { create(:user) } subject { described_class.new(user) } diff --git a/spec/services/keys/last_used_service_spec.rb b/spec/services/keys/last_used_service_spec.rb index c675df39f4d..82b6b05975b 100644 --- a/spec/services/keys/last_used_service_spec.rb +++ b/spec/services/keys/last_used_service_spec.rb @@ -2,7 +2,7 @@ require 'spec_helper' -describe Keys::LastUsedService do +RSpec.describe Keys::LastUsedService do describe '#execute', :clean_gitlab_redis_shared_state do it 'updates the key when it has not been used recently' do key = create(:key, last_used_at: 1.year.ago) diff --git a/spec/services/labels/available_labels_service_spec.rb b/spec/services/labels/available_labels_service_spec.rb index 56826257d6f..9912f2cf469 100644 --- a/spec/services/labels/available_labels_service_spec.rb +++ b/spec/services/labels/available_labels_service_spec.rb @@ -1,7 +1,7 @@ # frozen_string_literal: true require 'spec_helper' -describe Labels::AvailableLabelsService do +RSpec.describe Labels::AvailableLabelsService do let(:user) { create(:user) } let(:project) { create(:project, :public, group: group) } let(:group) { create(:group) } diff --git a/spec/services/labels/create_service_spec.rb b/spec/services/labels/create_service_spec.rb index f057c4401e7..7a31a5a7cae 100644 --- a/spec/services/labels/create_service_spec.rb +++ b/spec/services/labels/create_service_spec.rb @@ -2,7 +2,7 @@ require 'spec_helper' -describe Labels::CreateService do +RSpec.describe Labels::CreateService do describe '#execute' do let(:project) { create(:project) } let(:group) { create(:group) } diff --git a/spec/services/labels/find_or_create_service_spec.rb b/spec/services/labels/find_or_create_service_spec.rb index 438d895392b..aa9eb0e6a0d 100644 --- a/spec/services/labels/find_or_create_service_spec.rb +++ b/spec/services/labels/find_or_create_service_spec.rb @@ -2,7 +2,7 @@ require 'spec_helper' -describe Labels::FindOrCreateService do +RSpec.describe Labels::FindOrCreateService do describe '#execute' do let(:group) { create(:group) } let(:project) { create(:project, namespace: group) } diff --git a/spec/services/labels/promote_service_spec.rb b/spec/services/labels/promote_service_spec.rb index d86281b751c..7674ec36331 100644 --- a/spec/services/labels/promote_service_spec.rb +++ b/spec/services/labels/promote_service_spec.rb @@ -2,7 +2,7 @@ require 'spec_helper' -describe Labels::PromoteService do +RSpec.describe Labels::PromoteService do describe '#execute' do let!(:user) { create(:user) } diff --git a/spec/services/labels/transfer_service_spec.rb b/spec/services/labels/transfer_service_spec.rb index a2a9c8dddf2..2c0c82ed976 100644 --- a/spec/services/labels/transfer_service_spec.rb +++ b/spec/services/labels/transfer_service_spec.rb @@ -2,7 +2,7 @@ require 'spec_helper' -describe Labels::TransferService do +RSpec.describe Labels::TransferService do describe '#execute' do let_it_be(:user) { create(:admin) } diff --git a/spec/services/labels/update_service_spec.rb b/spec/services/labels/update_service_spec.rb index 045e8af1135..af2403656af 100644 --- a/spec/services/labels/update_service_spec.rb +++ b/spec/services/labels/update_service_spec.rb @@ -2,7 +2,7 @@ require 'spec_helper' -describe Labels::UpdateService do +RSpec.describe Labels::UpdateService do describe '#execute' do let(:project) { create(:project) } diff --git a/spec/services/lfs/file_transformer_spec.rb b/spec/services/lfs/file_transformer_spec.rb index 13d9c369c42..e87c80b4c6c 100644 --- a/spec/services/lfs/file_transformer_spec.rb +++ b/spec/services/lfs/file_transformer_spec.rb @@ -2,7 +2,7 @@ require "spec_helper" -describe Lfs::FileTransformer do +RSpec.describe Lfs::FileTransformer do let(:project) { create(:project, :repository, :wiki_repo) } let(:repository) { project.repository } let(:file_content) { 'Test file content' } diff --git a/spec/services/lfs/lock_file_service_spec.rb b/spec/services/lfs/lock_file_service_spec.rb index 2bd62b96083..b3a121866c8 100644 --- a/spec/services/lfs/lock_file_service_spec.rb +++ b/spec/services/lfs/lock_file_service_spec.rb @@ -2,7 +2,7 @@ require 'spec_helper' -describe Lfs::LockFileService do +RSpec.describe Lfs::LockFileService do let(:project) { create(:project) } let(:current_user) { create(:user) } diff --git a/spec/services/lfs/locks_finder_service_spec.rb b/spec/services/lfs/locks_finder_service_spec.rb index fdc60e2c03f..1167212eb69 100644 --- a/spec/services/lfs/locks_finder_service_spec.rb +++ b/spec/services/lfs/locks_finder_service_spec.rb @@ -2,7 +2,7 @@ require 'spec_helper' -describe Lfs::LocksFinderService do +RSpec.describe Lfs::LocksFinderService do let(:project) { create(:project) } let(:user) { create(:user) } let(:params) { {} } diff --git a/spec/services/lfs/unlock_file_service_spec.rb b/spec/services/lfs/unlock_file_service_spec.rb index 1334b074e84..7ab269f897a 100644 --- a/spec/services/lfs/unlock_file_service_spec.rb +++ b/spec/services/lfs/unlock_file_service_spec.rb @@ -2,7 +2,7 @@ require 'spec_helper' -describe Lfs::UnlockFileService do +RSpec.describe Lfs::UnlockFileService do let(:project) { create(:project) } let(:current_user) { create(:user) } let(:lock_author) { create(:user) } diff --git a/spec/services/members/approve_access_request_service_spec.rb b/spec/services/members/approve_access_request_service_spec.rb index 5bbceac3dd0..e6a94fdaf84 100644 --- a/spec/services/members/approve_access_request_service_spec.rb +++ b/spec/services/members/approve_access_request_service_spec.rb @@ -2,7 +2,7 @@ require 'spec_helper' -describe Members::ApproveAccessRequestService do +RSpec.describe Members::ApproveAccessRequestService do let(:project) { create(:project, :public) } let(:group) { create(:group, :public) } let(:current_user) { create(:user) } diff --git a/spec/services/members/create_service_spec.rb b/spec/services/members/create_service_spec.rb index 674fe0f666e..00b5ff59e48 100644 --- a/spec/services/members/create_service_spec.rb +++ b/spec/services/members/create_service_spec.rb @@ -2,7 +2,7 @@ require 'spec_helper' -describe Members::CreateService do +RSpec.describe Members::CreateService do let(:project) { create(:project) } let(:user) { create(:user) } let(:project_user) { create(:user) } diff --git a/spec/services/members/destroy_service_spec.rb b/spec/services/members/destroy_service_spec.rb index 5b01a538d1f..005fbe4fb83 100644 --- a/spec/services/members/destroy_service_spec.rb +++ b/spec/services/members/destroy_service_spec.rb @@ -2,7 +2,7 @@ require 'spec_helper' -describe Members::DestroyService do +RSpec.describe Members::DestroyService do let(:current_user) { create(:user) } let(:member_user) { create(:user) } let(:group) { create(:group, :public) } diff --git a/spec/services/members/request_access_service_spec.rb b/spec/services/members/request_access_service_spec.rb index a0f7ae91bdb..69eea2aea4b 100644 --- a/spec/services/members/request_access_service_spec.rb +++ b/spec/services/members/request_access_service_spec.rb @@ -2,7 +2,7 @@ require 'spec_helper' -describe Members::RequestAccessService do +RSpec.describe Members::RequestAccessService do let(:user) { create(:user) } shared_examples 'a service raising Gitlab::Access::AccessDeniedError' do diff --git a/spec/services/members/update_service_spec.rb b/spec/services/members/update_service_spec.rb index a8b28127df2..f510916558b 100644 --- a/spec/services/members/update_service_spec.rb +++ b/spec/services/members/update_service_spec.rb @@ -2,7 +2,7 @@ require 'spec_helper' -describe Members::UpdateService do +RSpec.describe Members::UpdateService do let(:project) { create(:project, :public) } let(:group) { create(:group, :public) } let(:current_user) { create(:user) } diff --git a/spec/services/merge_requests/add_context_service_spec.rb b/spec/services/merge_requests/add_context_service_spec.rb index d4e95c2f1ea..58ed91218d1 100644 --- a/spec/services/merge_requests/add_context_service_spec.rb +++ b/spec/services/merge_requests/add_context_service_spec.rb @@ -2,7 +2,7 @@ require 'spec_helper' -describe MergeRequests::AddContextService do +RSpec.describe MergeRequests::AddContextService do let(:project) { create(:project, :repository) } let(:admin) { create(:admin) } let(:merge_request) { create(:merge_request, source_project: project, target_project: project, author: admin) } diff --git a/spec/services/merge_requests/add_todo_when_build_fails_service_spec.rb b/spec/services/merge_requests/add_todo_when_build_fails_service_spec.rb index 0cec1e7be22..3c81ad6722d 100644 --- a/spec/services/merge_requests/add_todo_when_build_fails_service_spec.rb +++ b/spec/services/merge_requests/add_todo_when_build_fails_service_spec.rb @@ -2,7 +2,7 @@ require 'spec_helper' -describe MergeRequests::AddTodoWhenBuildFailsService do +RSpec.describe MergeRequests::AddTodoWhenBuildFailsService do let(:user) { create(:user) } let(:project) { create(:project, :repository) } let(:sha) { '1234567890abcdef1234567890abcdef12345678' } diff --git a/spec/services/merge_requests/after_create_service_spec.rb b/spec/services/merge_requests/after_create_service_spec.rb index 4aefe5f7dae..840b7bc0a1c 100644 --- a/spec/services/merge_requests/after_create_service_spec.rb +++ b/spec/services/merge_requests/after_create_service_spec.rb @@ -2,7 +2,7 @@ require 'spec_helper' -describe MergeRequests::AfterCreateService do +RSpec.describe MergeRequests::AfterCreateService do let_it_be(:merge_request) { create(:merge_request) } subject(:after_create_service) do diff --git a/spec/services/merge_requests/assign_issues_service_spec.rb b/spec/services/merge_requests/assign_issues_service_spec.rb index c0b57b9092d..6398e8c533e 100644 --- a/spec/services/merge_requests/assign_issues_service_spec.rb +++ b/spec/services/merge_requests/assign_issues_service_spec.rb @@ -2,7 +2,7 @@ require 'spec_helper' -describe MergeRequests::AssignIssuesService do +RSpec.describe MergeRequests::AssignIssuesService do let(:user) { create(:user) } let(:project) { create(:project, :public, :repository) } let(:issue) { create(:issue, project: project) } diff --git a/spec/services/merge_requests/build_service_spec.rb b/spec/services/merge_requests/build_service_spec.rb index 9b358839c06..8fb5d1c0dd0 100644 --- a/spec/services/merge_requests/build_service_spec.rb +++ b/spec/services/merge_requests/build_service_spec.rb @@ -1,7 +1,7 @@ # frozen_string_literal: true require 'spec_helper' -describe MergeRequests::BuildService do +RSpec.describe MergeRequests::BuildService do using RSpec::Parameterized::TableSyntax include RepoHelpers include ProjectForksHelper diff --git a/spec/services/merge_requests/close_service_spec.rb b/spec/services/merge_requests/close_service_spec.rb index 0e51de48fb1..e518e439a84 100644 --- a/spec/services/merge_requests/close_service_spec.rb +++ b/spec/services/merge_requests/close_service_spec.rb @@ -2,7 +2,7 @@ require 'spec_helper' -describe MergeRequests::CloseService do +RSpec.describe MergeRequests::CloseService do let(:user) { create(:user) } let(:user2) { create(:user) } let(:guest) { create(:user) } diff --git a/spec/services/merge_requests/conflicts/list_service_spec.rb b/spec/services/merge_requests/conflicts/list_service_spec.rb index 13d69307084..cd9eae2f2ee 100644 --- a/spec/services/merge_requests/conflicts/list_service_spec.rb +++ b/spec/services/merge_requests/conflicts/list_service_spec.rb @@ -2,7 +2,7 @@ require 'spec_helper' -describe MergeRequests::Conflicts::ListService do +RSpec.describe MergeRequests::Conflicts::ListService do describe '#can_be_resolved_in_ui?' do def create_merge_request(source_branch, target_branch = 'conflict-start') create(:merge_request, source_branch: source_branch, target_branch: target_branch, merge_status: :unchecked) do |mr| diff --git a/spec/services/merge_requests/conflicts/resolve_service_spec.rb b/spec/services/merge_requests/conflicts/resolve_service_spec.rb index 74f20094081..c4d50124ca9 100644 --- a/spec/services/merge_requests/conflicts/resolve_service_spec.rb +++ b/spec/services/merge_requests/conflicts/resolve_service_spec.rb @@ -2,7 +2,7 @@ require 'spec_helper' -describe MergeRequests::Conflicts::ResolveService do +RSpec.describe MergeRequests::Conflicts::ResolveService do include ProjectForksHelper let(:user) { create(:user) } let(:project) { create(:project, :public, :repository) } diff --git a/spec/services/merge_requests/create_from_issue_service_spec.rb b/spec/services/merge_requests/create_from_issue_service_spec.rb index fb1bb308170..5bcc52a4e42 100644 --- a/spec/services/merge_requests/create_from_issue_service_spec.rb +++ b/spec/services/merge_requests/create_from_issue_service_spec.rb @@ -2,7 +2,7 @@ require 'spec_helper' -describe MergeRequests::CreateFromIssueService do +RSpec.describe MergeRequests::CreateFromIssueService do include ProjectForksHelper let(:project) { create(:project, :repository) } diff --git a/spec/services/merge_requests/create_pipeline_service_spec.rb b/spec/services/merge_requests/create_pipeline_service_spec.rb index 9eb28759061..9100a2fad10 100644 --- a/spec/services/merge_requests/create_pipeline_service_spec.rb +++ b/spec/services/merge_requests/create_pipeline_service_spec.rb @@ -2,7 +2,7 @@ require 'spec_helper' -describe MergeRequests::CreatePipelineService do +RSpec.describe MergeRequests::CreatePipelineService do let_it_be(:project) { create(:project, :repository) } let_it_be(:user) { create(:user) } let(:service) { described_class.new(project, user, params) } diff --git a/spec/services/merge_requests/create_service_spec.rb b/spec/services/merge_requests/create_service_spec.rb index bb40c399b6e..015d493583f 100644 --- a/spec/services/merge_requests/create_service_spec.rb +++ b/spec/services/merge_requests/create_service_spec.rb @@ -2,7 +2,7 @@ require 'spec_helper' -describe MergeRequests::CreateService, :clean_gitlab_redis_shared_state do +RSpec.describe MergeRequests::CreateService, :clean_gitlab_redis_shared_state do include ProjectForksHelper let(:project) { create(:project, :repository) } diff --git a/spec/services/merge_requests/delete_non_latest_diffs_service_spec.rb b/spec/services/merge_requests/delete_non_latest_diffs_service_spec.rb index 2adf808619d..377615bbc6f 100644 --- a/spec/services/merge_requests/delete_non_latest_diffs_service_spec.rb +++ b/spec/services/merge_requests/delete_non_latest_diffs_service_spec.rb @@ -2,7 +2,7 @@ require 'spec_helper' -describe MergeRequests::DeleteNonLatestDiffsService, :clean_gitlab_redis_shared_state do +RSpec.describe MergeRequests::DeleteNonLatestDiffsService, :clean_gitlab_redis_shared_state do let(:merge_request) { create(:merge_request) } let!(:subject) { described_class.new(merge_request) } diff --git a/spec/services/merge_requests/ff_merge_service_spec.rb b/spec/services/merge_requests/ff_merge_service_spec.rb index 415b351e13a..c3da02273a4 100644 --- a/spec/services/merge_requests/ff_merge_service_spec.rb +++ b/spec/services/merge_requests/ff_merge_service_spec.rb @@ -2,7 +2,7 @@ require 'spec_helper' -describe MergeRequests::FfMergeService do +RSpec.describe MergeRequests::FfMergeService do let(:user) { create(:user) } let(:user2) { create(:user) } let(:merge_request) do diff --git a/spec/services/merge_requests/get_urls_service_spec.rb b/spec/services/merge_requests/get_urls_service_spec.rb index 8cc627b64d9..053752626dc 100644 --- a/spec/services/merge_requests/get_urls_service_spec.rb +++ b/spec/services/merge_requests/get_urls_service_spec.rb @@ -2,7 +2,7 @@ require "spec_helper" -describe MergeRequests::GetUrlsService do +RSpec.describe MergeRequests::GetUrlsService do include ProjectForksHelper let(:project) { create(:project, :public, :repository) } diff --git a/spec/services/merge_requests/link_lfs_objects_service_spec.rb b/spec/services/merge_requests/link_lfs_objects_service_spec.rb index f07cf13e4f2..c1765e3a2ab 100644 --- a/spec/services/merge_requests/link_lfs_objects_service_spec.rb +++ b/spec/services/merge_requests/link_lfs_objects_service_spec.rb @@ -2,7 +2,7 @@ require 'spec_helper' -describe MergeRequests::LinkLfsObjectsService, :sidekiq_inline do +RSpec.describe MergeRequests::LinkLfsObjectsService, :sidekiq_inline do include ProjectForksHelper include RepoHelpers diff --git a/spec/services/merge_requests/merge_orchestration_service_spec.rb b/spec/services/merge_requests/merge_orchestration_service_spec.rb index c50f20d7703..67dbb5a1a01 100644 --- a/spec/services/merge_requests/merge_orchestration_service_spec.rb +++ b/spec/services/merge_requests/merge_orchestration_service_spec.rb @@ -2,7 +2,7 @@ require 'spec_helper' -describe MergeRequests::MergeOrchestrationService do +RSpec.describe MergeRequests::MergeOrchestrationService do let_it_be(:maintainer) { create(:user) } let(:merge_params) { { sha: merge_request.diff_head_sha } } let(:user) { maintainer } diff --git a/spec/services/merge_requests/merge_service_spec.rb b/spec/services/merge_requests/merge_service_spec.rb index 2274d917527..94ecd1830c2 100644 --- a/spec/services/merge_requests/merge_service_spec.rb +++ b/spec/services/merge_requests/merge_service_spec.rb @@ -2,7 +2,7 @@ require 'spec_helper' -describe MergeRequests::MergeService do +RSpec.describe MergeRequests::MergeService do let_it_be(:user) { create(:user) } let_it_be(:user2) { create(:user) } let(:merge_request) { create(:merge_request, :simple, author: user2, assignees: [user2]) } diff --git a/spec/services/merge_requests/merge_to_ref_service_spec.rb b/spec/services/merge_requests/merge_to_ref_service_spec.rb index 596d46f3c43..b482e8d6724 100644 --- a/spec/services/merge_requests/merge_to_ref_service_spec.rb +++ b/spec/services/merge_requests/merge_to_ref_service_spec.rb @@ -2,7 +2,7 @@ require 'spec_helper' -describe MergeRequests::MergeToRefService do +RSpec.describe MergeRequests::MergeToRefService do shared_examples_for 'MergeService for target ref' do it 'target_ref has the same state of target branch' do repo = merge_request.target_project.repository diff --git a/spec/services/merge_requests/mergeability_check_service_spec.rb b/spec/services/merge_requests/mergeability_check_service_spec.rb index 45519ddf3d3..543da46f883 100644 --- a/spec/services/merge_requests/mergeability_check_service_spec.rb +++ b/spec/services/merge_requests/mergeability_check_service_spec.rb @@ -2,7 +2,7 @@ require 'spec_helper' -describe MergeRequests::MergeabilityCheckService, :clean_gitlab_redis_shared_state do +RSpec.describe MergeRequests::MergeabilityCheckService, :clean_gitlab_redis_shared_state do shared_examples_for 'unmergeable merge request' do it 'updates or keeps merge status as cannot_be_merged' do subject diff --git a/spec/services/merge_requests/migrate_external_diffs_service_spec.rb b/spec/services/merge_requests/migrate_external_diffs_service_spec.rb index 233b944624f..6ea8626ba73 100644 --- a/spec/services/merge_requests/migrate_external_diffs_service_spec.rb +++ b/spec/services/merge_requests/migrate_external_diffs_service_spec.rb @@ -2,7 +2,7 @@ require 'spec_helper' -describe MergeRequests::MigrateExternalDiffsService do +RSpec.describe MergeRequests::MigrateExternalDiffsService do let(:merge_request) { create(:merge_request) } let(:diff) { merge_request.merge_request_diff } diff --git a/spec/services/merge_requests/post_merge_service_spec.rb b/spec/services/merge_requests/post_merge_service_spec.rb index fff6ddf3928..aefd3454b1b 100644 --- a/spec/services/merge_requests/post_merge_service_spec.rb +++ b/spec/services/merge_requests/post_merge_service_spec.rb @@ -2,7 +2,7 @@ require 'spec_helper' -describe MergeRequests::PostMergeService do +RSpec.describe MergeRequests::PostMergeService do let(:user) { create(:user) } let(:merge_request) { create(:merge_request, assignees: [user]) } let(:project) { merge_request.project } diff --git a/spec/services/merge_requests/push_options_handler_service_spec.rb b/spec/services/merge_requests/push_options_handler_service_spec.rb index 420c8513c72..55f92d6bd0a 100644 --- a/spec/services/merge_requests/push_options_handler_service_spec.rb +++ b/spec/services/merge_requests/push_options_handler_service_spec.rb @@ -2,7 +2,7 @@ require 'spec_helper' -describe MergeRequests::PushOptionsHandlerService do +RSpec.describe MergeRequests::PushOptionsHandlerService do include ProjectForksHelper let(:user) { create(:user) } diff --git a/spec/services/merge_requests/pushed_branches_service_spec.rb b/spec/services/merge_requests/pushed_branches_service_spec.rb index 7b5d505f4d9..6e9c77bd3b6 100644 --- a/spec/services/merge_requests/pushed_branches_service_spec.rb +++ b/spec/services/merge_requests/pushed_branches_service_spec.rb @@ -2,7 +2,7 @@ require 'spec_helper' -describe MergeRequests::PushedBranchesService do +RSpec.describe MergeRequests::PushedBranchesService do let(:project) { create(:project) } let!(:service) { described_class.new(project, nil, changes: pushed_branches) } diff --git a/spec/services/merge_requests/rebase_service_spec.rb b/spec/services/merge_requests/rebase_service_spec.rb index 69d555f838d..2e525f2ed01 100644 --- a/spec/services/merge_requests/rebase_service_spec.rb +++ b/spec/services/merge_requests/rebase_service_spec.rb @@ -2,7 +2,7 @@ require 'spec_helper' -describe MergeRequests::RebaseService do +RSpec.describe MergeRequests::RebaseService do include ProjectForksHelper let(:user) { create(:user) } diff --git a/spec/services/merge_requests/refresh_service_spec.rb b/spec/services/merge_requests/refresh_service_spec.rb index e60ff6eb98a..b8f29769429 100644 --- a/spec/services/merge_requests/refresh_service_spec.rb +++ b/spec/services/merge_requests/refresh_service_spec.rb @@ -2,7 +2,7 @@ require 'spec_helper' -describe MergeRequests::RefreshService do +RSpec.describe MergeRequests::RefreshService do include ProjectForksHelper include ProjectHelpers diff --git a/spec/services/merge_requests/reload_diffs_service_spec.rb b/spec/services/merge_requests/reload_diffs_service_spec.rb index d2444af1b0f..3d5b65207e6 100644 --- a/spec/services/merge_requests/reload_diffs_service_spec.rb +++ b/spec/services/merge_requests/reload_diffs_service_spec.rb @@ -2,7 +2,7 @@ require 'spec_helper' -describe MergeRequests::ReloadDiffsService, :use_clean_rails_memory_store_caching do +RSpec.describe MergeRequests::ReloadDiffsService, :use_clean_rails_memory_store_caching do let(:current_user) { create(:user) } let(:merge_request) { create(:merge_request) } let(:subject) { described_class.new(merge_request, current_user) } @@ -34,10 +34,8 @@ describe MergeRequests::ReloadDiffsService, :use_clean_rails_memory_store_cachin context 'cache clearing' do it 'clears the cache for older diffs on the merge request' do - old_diff = merge_request.merge_request_diff - old_cache_key = old_diff.diffs_collection.cache_key - - expect_any_instance_of(Redis).to receive(:del).with(old_cache_key).and_call_original + expect_any_instance_of(Redis).to receive(:del).once.and_call_original + expect(Rails.cache).to receive(:delete).once.and_call_original subject.execute end diff --git a/spec/services/merge_requests/reopen_service_spec.rb b/spec/services/merge_requests/reopen_service_spec.rb index 3807c44b01f..0066834180e 100644 --- a/spec/services/merge_requests/reopen_service_spec.rb +++ b/spec/services/merge_requests/reopen_service_spec.rb @@ -2,7 +2,7 @@ require 'spec_helper' -describe MergeRequests::ReopenService do +RSpec.describe MergeRequests::ReopenService do let(:user) { create(:user) } let(:user2) { create(:user) } let(:guest) { create(:user) } diff --git a/spec/services/merge_requests/resolved_discussion_notification_service_spec.rb b/spec/services/merge_requests/resolved_discussion_notification_service_spec.rb index 29896db58ac..874cf66659a 100644 --- a/spec/services/merge_requests/resolved_discussion_notification_service_spec.rb +++ b/spec/services/merge_requests/resolved_discussion_notification_service_spec.rb @@ -2,7 +2,7 @@ require 'spec_helper' -describe MergeRequests::ResolvedDiscussionNotificationService do +RSpec.describe MergeRequests::ResolvedDiscussionNotificationService do let(:merge_request) { create(:merge_request) } let(:user) { create(:user) } let(:project) { merge_request.project } diff --git a/spec/services/merge_requests/squash_service_spec.rb b/spec/services/merge_requests/squash_service_spec.rb index a53314ed737..b51b7d9fbc6 100644 --- a/spec/services/merge_requests/squash_service_spec.rb +++ b/spec/services/merge_requests/squash_service_spec.rb @@ -2,7 +2,7 @@ require 'spec_helper' -describe MergeRequests::SquashService do +RSpec.describe MergeRequests::SquashService do include GitHelpers let(:service) { described_class.new(project, user, { merge_request: merge_request }) } diff --git a/spec/services/merge_requests/update_service_spec.rb b/spec/services/merge_requests/update_service_spec.rb index 2b934b24757..bba275bce0b 100644 --- a/spec/services/merge_requests/update_service_spec.rb +++ b/spec/services/merge_requests/update_service_spec.rb @@ -2,7 +2,7 @@ require 'spec_helper' -describe MergeRequests::UpdateService, :mailer do +RSpec.describe MergeRequests::UpdateService, :mailer do include ProjectForksHelper let(:group) { create(:group, :public) } diff --git a/spec/services/metrics/dashboard/annotations/create_service_spec.rb b/spec/services/metrics/dashboard/annotations/create_service_spec.rb index 7dabca3c860..c3fe7238047 100644 --- a/spec/services/metrics/dashboard/annotations/create_service_spec.rb +++ b/spec/services/metrics/dashboard/annotations/create_service_spec.rb @@ -2,7 +2,7 @@ require 'spec_helper' -describe Metrics::Dashboard::Annotations::CreateService do +RSpec.describe Metrics::Dashboard::Annotations::CreateService do let_it_be(:user) { create(:user) } let(:description) { 'test annotation' } let(:dashboard_path) { 'config/prometheus/common_metrics.yml' } diff --git a/spec/services/metrics/dashboard/annotations/delete_service_spec.rb b/spec/services/metrics/dashboard/annotations/delete_service_spec.rb index 95825db6902..ec2bd3772bf 100644 --- a/spec/services/metrics/dashboard/annotations/delete_service_spec.rb +++ b/spec/services/metrics/dashboard/annotations/delete_service_spec.rb @@ -2,7 +2,7 @@ require 'spec_helper' -describe Metrics::Dashboard::Annotations::DeleteService do +RSpec.describe Metrics::Dashboard::Annotations::DeleteService do let(:user) { create(:user) } let(:service_instance) { described_class.new(user, annotation) } diff --git a/spec/services/metrics/dashboard/clone_dashboard_service_spec.rb b/spec/services/metrics/dashboard/clone_dashboard_service_spec.rb index 3d26ab2ede5..6bb98047b21 100644 --- a/spec/services/metrics/dashboard/clone_dashboard_service_spec.rb +++ b/spec/services/metrics/dashboard/clone_dashboard_service_spec.rb @@ -2,7 +2,7 @@ require 'spec_helper' -describe Metrics::Dashboard::CloneDashboardService, :use_clean_rails_memory_store_caching do +RSpec.describe Metrics::Dashboard::CloneDashboardService, :use_clean_rails_memory_store_caching do include MetricsDashboardHelpers let_it_be(:user) { create(:user) } diff --git a/spec/services/metrics/dashboard/custom_dashboard_service_spec.rb b/spec/services/metrics/dashboard/custom_dashboard_service_spec.rb index 4966b83bbab..f4559ab9e14 100644 --- a/spec/services/metrics/dashboard/custom_dashboard_service_spec.rb +++ b/spec/services/metrics/dashboard/custom_dashboard_service_spec.rb @@ -2,7 +2,7 @@ require 'spec_helper' -describe Metrics::Dashboard::CustomDashboardService, :use_clean_rails_memory_store_caching do +RSpec.describe Metrics::Dashboard::CustomDashboardService, :use_clean_rails_memory_store_caching do include MetricsDashboardHelpers let_it_be(:user) { create(:user) } diff --git a/spec/services/metrics/dashboard/custom_metric_embed_service_spec.rb b/spec/services/metrics/dashboard/custom_metric_embed_service_spec.rb index 1a9ddc87ab0..a5f7c2ab8ab 100644 --- a/spec/services/metrics/dashboard/custom_metric_embed_service_spec.rb +++ b/spec/services/metrics/dashboard/custom_metric_embed_service_spec.rb @@ -2,7 +2,7 @@ require 'spec_helper' -describe Metrics::Dashboard::CustomMetricEmbedService do +RSpec.describe Metrics::Dashboard::CustomMetricEmbedService do include MetricsDashboardHelpers let_it_be(:project, reload: true) { build(:project) } diff --git a/spec/services/metrics/dashboard/default_embed_service_spec.rb b/spec/services/metrics/dashboard/default_embed_service_spec.rb index 8e32316433d..2ce10eac026 100644 --- a/spec/services/metrics/dashboard/default_embed_service_spec.rb +++ b/spec/services/metrics/dashboard/default_embed_service_spec.rb @@ -2,7 +2,7 @@ require 'spec_helper' -describe Metrics::Dashboard::DefaultEmbedService, :use_clean_rails_memory_store_caching do +RSpec.describe Metrics::Dashboard::DefaultEmbedService, :use_clean_rails_memory_store_caching do include MetricsDashboardHelpers let_it_be(:project) { build(:project) } diff --git a/spec/services/metrics/dashboard/dynamic_embed_service_spec.rb b/spec/services/metrics/dashboard/dynamic_embed_service_spec.rb index ee75284b4ce..72b356be60f 100644 --- a/spec/services/metrics/dashboard/dynamic_embed_service_spec.rb +++ b/spec/services/metrics/dashboard/dynamic_embed_service_spec.rb @@ -2,7 +2,7 @@ require 'spec_helper' -describe Metrics::Dashboard::DynamicEmbedService, :use_clean_rails_memory_store_caching do +RSpec.describe Metrics::Dashboard::DynamicEmbedService, :use_clean_rails_memory_store_caching do include MetricsDashboardHelpers let_it_be(:project) { build(:project) } diff --git a/spec/services/metrics/dashboard/gitlab_alert_embed_service_spec.rb b/spec/services/metrics/dashboard/gitlab_alert_embed_service_spec.rb index a66150be42c..29c941826b5 100644 --- a/spec/services/metrics/dashboard/gitlab_alert_embed_service_spec.rb +++ b/spec/services/metrics/dashboard/gitlab_alert_embed_service_spec.rb @@ -2,7 +2,7 @@ require 'spec_helper' -describe Metrics::Dashboard::GitlabAlertEmbedService do +RSpec.describe Metrics::Dashboard::GitlabAlertEmbedService do include MetricsDashboardHelpers let_it_be(:alert) { create(:prometheus_alert) } diff --git a/spec/services/metrics/dashboard/grafana_metric_embed_service_spec.rb b/spec/services/metrics/dashboard/grafana_metric_embed_service_spec.rb index 3547e1f0f8c..ee3c55cb642 100644 --- a/spec/services/metrics/dashboard/grafana_metric_embed_service_spec.rb +++ b/spec/services/metrics/dashboard/grafana_metric_embed_service_spec.rb @@ -2,7 +2,7 @@ require 'spec_helper' -describe Metrics::Dashboard::GrafanaMetricEmbedService do +RSpec.describe Metrics::Dashboard::GrafanaMetricEmbedService do include MetricsDashboardHelpers include ReactiveCachingHelpers include GrafanaApiHelpers @@ -182,7 +182,7 @@ describe Metrics::Dashboard::GrafanaMetricEmbedService do end end -describe Metrics::Dashboard::GrafanaUidParser do +RSpec.describe Metrics::Dashboard::GrafanaUidParser do let_it_be(:grafana_integration) { create(:grafana_integration) } let_it_be(:project) { grafana_integration.project } @@ -213,7 +213,7 @@ describe Metrics::Dashboard::GrafanaUidParser do end end -describe Metrics::Dashboard::DatasourceNameParser do +RSpec.describe Metrics::Dashboard::DatasourceNameParser do include GrafanaApiHelpers let(:grafana_url) { valid_grafana_dashboard_link('https://gitlab.grafana.net') } diff --git a/spec/services/metrics/dashboard/pod_dashboard_service_spec.rb b/spec/services/metrics/dashboard/pod_dashboard_service_spec.rb index 1e62a5504a9..6a764d341d6 100644 --- a/spec/services/metrics/dashboard/pod_dashboard_service_spec.rb +++ b/spec/services/metrics/dashboard/pod_dashboard_service_spec.rb @@ -2,7 +2,7 @@ require 'spec_helper' -describe Metrics::Dashboard::PodDashboardService, :use_clean_rails_memory_store_caching do +RSpec.describe Metrics::Dashboard::PodDashboardService, :use_clean_rails_memory_store_caching do include MetricsDashboardHelpers let_it_be(:user) { create(:user) } diff --git a/spec/services/metrics/dashboard/self_monitoring_dashboard_service_spec.rb b/spec/services/metrics/dashboard/self_monitoring_dashboard_service_spec.rb index 6c9a380a470..8be5aaae0e0 100644 --- a/spec/services/metrics/dashboard/self_monitoring_dashboard_service_spec.rb +++ b/spec/services/metrics/dashboard/self_monitoring_dashboard_service_spec.rb @@ -2,7 +2,7 @@ require 'spec_helper' -describe Metrics::Dashboard::SelfMonitoringDashboardService, :use_clean_rails_memory_store_caching do +RSpec.describe Metrics::Dashboard::SelfMonitoringDashboardService, :use_clean_rails_memory_store_caching do include MetricsDashboardHelpers let_it_be(:user) { create(:user) } diff --git a/spec/services/metrics/dashboard/system_dashboard_service_spec.rb b/spec/services/metrics/dashboard/system_dashboard_service_spec.rb index 7d58501ae3f..679f0686fe2 100644 --- a/spec/services/metrics/dashboard/system_dashboard_service_spec.rb +++ b/spec/services/metrics/dashboard/system_dashboard_service_spec.rb @@ -2,7 +2,7 @@ require 'spec_helper' -describe Metrics::Dashboard::SystemDashboardService, :use_clean_rails_memory_store_caching do +RSpec.describe Metrics::Dashboard::SystemDashboardService, :use_clean_rails_memory_store_caching do include MetricsDashboardHelpers let_it_be(:user) { create(:user) } diff --git a/spec/services/metrics/dashboard/transient_embed_service_spec.rb b/spec/services/metrics/dashboard/transient_embed_service_spec.rb index 125fff7c23c..3fd0c97d909 100644 --- a/spec/services/metrics/dashboard/transient_embed_service_spec.rb +++ b/spec/services/metrics/dashboard/transient_embed_service_spec.rb @@ -2,7 +2,7 @@ require 'spec_helper' -describe Metrics::Dashboard::TransientEmbedService, :use_clean_rails_memory_store_caching do +RSpec.describe Metrics::Dashboard::TransientEmbedService, :use_clean_rails_memory_store_caching do let_it_be(:project) { build(:project) } let_it_be(:user) { create(:user) } let_it_be(:environment) { create(:environment, project: project) } diff --git a/spec/services/metrics/dashboard/update_dashboard_service_spec.rb b/spec/services/metrics/dashboard/update_dashboard_service_spec.rb index fce027688d9..148005480ea 100644 --- a/spec/services/metrics/dashboard/update_dashboard_service_spec.rb +++ b/spec/services/metrics/dashboard/update_dashboard_service_spec.rb @@ -2,7 +2,7 @@ require 'spec_helper' -describe Metrics::Dashboard::UpdateDashboardService, :use_clean_rails_memory_store_caching do +RSpec.describe Metrics::Dashboard::UpdateDashboardService, :use_clean_rails_memory_store_caching do include MetricsDashboardHelpers let_it_be(:user) { create(:user) } diff --git a/spec/services/metrics/sample_metrics_service_spec.rb b/spec/services/metrics/sample_metrics_service_spec.rb index 3b4f7cb8062..b94345500f0 100644 --- a/spec/services/metrics/sample_metrics_service_spec.rb +++ b/spec/services/metrics/sample_metrics_service_spec.rb @@ -2,7 +2,7 @@ require 'spec_helper' -describe Metrics::SampleMetricsService do +RSpec.describe Metrics::SampleMetricsService do describe 'query' do let(:range_start) { '2019-12-02T23:31:45.000Z' } let(:range_end) { '2019-12-03T00:01:45.000Z' } diff --git a/spec/services/metrics/users_starred_dashboards/create_service_spec.rb b/spec/services/metrics/users_starred_dashboards/create_service_spec.rb index eac4965ba44..910b556b8dd 100644 --- a/spec/services/metrics/users_starred_dashboards/create_service_spec.rb +++ b/spec/services/metrics/users_starred_dashboards/create_service_spec.rb @@ -2,7 +2,7 @@ require 'spec_helper' -describe Metrics::UsersStarredDashboards::CreateService do +RSpec.describe Metrics::UsersStarredDashboards::CreateService do let_it_be(:user) { create(:user) } let(:dashboard_path) { 'config/prometheus/common_metrics.yml' } let(:service_instance) { described_class.new(user, project, dashboard_path) } diff --git a/spec/services/metrics/users_starred_dashboards/delete_service_spec.rb b/spec/services/metrics/users_starred_dashboards/delete_service_spec.rb index 68a2fef5931..5cdffe681eb 100644 --- a/spec/services/metrics/users_starred_dashboards/delete_service_spec.rb +++ b/spec/services/metrics/users_starred_dashboards/delete_service_spec.rb @@ -2,7 +2,7 @@ require 'spec_helper' -describe Metrics::UsersStarredDashboards::DeleteService do +RSpec.describe Metrics::UsersStarredDashboards::DeleteService do subject(:service_instance) { described_class.new(user, project, dashboard_path) } let_it_be(:user) { create(:user) } diff --git a/spec/services/milestones/close_service_spec.rb b/spec/services/milestones/close_service_spec.rb index 55e705063b2..53751b40667 100644 --- a/spec/services/milestones/close_service_spec.rb +++ b/spec/services/milestones/close_service_spec.rb @@ -2,7 +2,7 @@ require 'spec_helper' -describe Milestones::CloseService do +RSpec.describe Milestones::CloseService do let(:user) { create(:user) } let(:project) { create(:project) } let(:milestone) { create(:milestone, title: "Milestone v1.2", project: project) } diff --git a/spec/services/milestones/closed_issues_count_service_spec.rb b/spec/services/milestones/closed_issues_count_service_spec.rb index b86eede2e22..a3865d08972 100644 --- a/spec/services/milestones/closed_issues_count_service_spec.rb +++ b/spec/services/milestones/closed_issues_count_service_spec.rb @@ -2,7 +2,7 @@ require 'spec_helper' -describe Milestones::ClosedIssuesCountService, :use_clean_rails_memory_store_caching do +RSpec.describe Milestones::ClosedIssuesCountService, :use_clean_rails_memory_store_caching do let(:project) { create(:project) } let(:milestone) { create(:milestone, project: project) } diff --git a/spec/services/milestones/create_service_spec.rb b/spec/services/milestones/create_service_spec.rb index 97f6e947539..93ca4ff653f 100644 --- a/spec/services/milestones/create_service_spec.rb +++ b/spec/services/milestones/create_service_spec.rb @@ -2,7 +2,7 @@ require 'spec_helper' -describe Milestones::CreateService do +RSpec.describe Milestones::CreateService do let(:project) { create(:project) } let(:user) { create(:user) } diff --git a/spec/services/milestones/destroy_service_spec.rb b/spec/services/milestones/destroy_service_spec.rb index 4f16421c39f..66c5c504c64 100644 --- a/spec/services/milestones/destroy_service_spec.rb +++ b/spec/services/milestones/destroy_service_spec.rb @@ -2,7 +2,7 @@ require 'spec_helper' -describe Milestones::DestroyService do +RSpec.describe Milestones::DestroyService do let(:user) { create(:user) } let(:project) { create(:project, :repository) } let(:milestone) { create(:milestone, title: 'Milestone v1.0', project: project) } diff --git a/spec/services/milestones/find_or_create_service_spec.rb b/spec/services/milestones/find_or_create_service_spec.rb index ae3def30982..1bcaf578441 100644 --- a/spec/services/milestones/find_or_create_service_spec.rb +++ b/spec/services/milestones/find_or_create_service_spec.rb @@ -2,7 +2,7 @@ require 'spec_helper' -describe Milestones::FindOrCreateService do +RSpec.describe Milestones::FindOrCreateService do describe '#execute' do subject(:service) { described_class.new(project, user, params) } diff --git a/spec/services/milestones/issues_count_service_spec.rb b/spec/services/milestones/issues_count_service_spec.rb index 22aea884424..c944055e4e7 100644 --- a/spec/services/milestones/issues_count_service_spec.rb +++ b/spec/services/milestones/issues_count_service_spec.rb @@ -2,7 +2,7 @@ require 'spec_helper' -describe Milestones::IssuesCountService, :use_clean_rails_memory_store_caching do +RSpec.describe Milestones::IssuesCountService, :use_clean_rails_memory_store_caching do let(:project) { create(:project) } let(:milestone) { create(:milestone, project: project) } diff --git a/spec/services/milestones/promote_service_spec.rb b/spec/services/milestones/promote_service_spec.rb index fa893b86cdb..f0a34241c74 100644 --- a/spec/services/milestones/promote_service_spec.rb +++ b/spec/services/milestones/promote_service_spec.rb @@ -2,7 +2,7 @@ require 'spec_helper' -describe Milestones::PromoteService do +RSpec.describe Milestones::PromoteService do let(:group) { create(:group) } let(:project) { create(:project, namespace: group) } let(:user) { create(:user) } diff --git a/spec/services/milestones/transfer_service_spec.rb b/spec/services/milestones/transfer_service_spec.rb index 9f94d2d320b..4a626fe688a 100644 --- a/spec/services/milestones/transfer_service_spec.rb +++ b/spec/services/milestones/transfer_service_spec.rb @@ -2,7 +2,7 @@ require 'spec_helper' -describe Milestones::TransferService do +RSpec.describe Milestones::TransferService do describe '#execute' do subject(:service) { described_class.new(user, old_group, project) } diff --git a/spec/services/milestones/update_service_spec.rb b/spec/services/milestones/update_service_spec.rb index 3b91442c0ba..85fd89c11ac 100644 --- a/spec/services/milestones/update_service_spec.rb +++ b/spec/services/milestones/update_service_spec.rb @@ -1,7 +1,7 @@ # frozen_string_literal: true require 'spec_helper' -describe Milestones::UpdateService do +RSpec.describe Milestones::UpdateService do let(:project) { create(:project) } let(:user) { build(:user) } let(:milestone) { create(:milestone, project: project) } diff --git a/spec/services/namespaces/check_storage_size_service_spec.rb b/spec/services/namespaces/check_storage_size_service_spec.rb index e192f897cf9..fa5e57cc6f3 100644 --- a/spec/services/namespaces/check_storage_size_service_spec.rb +++ b/spec/services/namespaces/check_storage_size_service_spec.rb @@ -2,7 +2,7 @@ require 'spec_helper' -describe Namespaces::CheckStorageSizeService, '#execute' do +RSpec.describe Namespaces::CheckStorageSizeService, '#execute' do let(:namespace) { build_stubbed(:namespace) } let(:user) { build(:user, namespace: namespace) } let(:service) { described_class.new(namespace, user) } diff --git a/spec/services/namespaces/statistics_refresher_service_spec.rb b/spec/services/namespaces/statistics_refresher_service_spec.rb index 1fa0a794edd..d3379e843ec 100644 --- a/spec/services/namespaces/statistics_refresher_service_spec.rb +++ b/spec/services/namespaces/statistics_refresher_service_spec.rb @@ -2,7 +2,7 @@ require 'spec_helper' -describe Namespaces::StatisticsRefresherService, '#execute' do +RSpec.describe Namespaces::StatisticsRefresherService, '#execute' do let(:group) { create(:group) } let(:projects) { create_list(:project, 5, namespace: group) } let(:service) { described_class.new } diff --git a/spec/services/note_summary_spec.rb b/spec/services/note_summary_spec.rb index 038e0cdb703..38174748b19 100644 --- a/spec/services/note_summary_spec.rb +++ b/spec/services/note_summary_spec.rb @@ -2,7 +2,7 @@ require 'spec_helper' -describe NoteSummary do +RSpec.describe NoteSummary do let(:project) { build(:project) } let(:noteable) { build(:issue) } let(:user) { build(:user) } diff --git a/spec/services/notes/build_service_spec.rb b/spec/services/notes/build_service_spec.rb index 984658cbd19..90548cf9a99 100644 --- a/spec/services/notes/build_service_spec.rb +++ b/spec/services/notes/build_service_spec.rb @@ -2,7 +2,7 @@ require 'spec_helper' -describe Notes::BuildService do +RSpec.describe Notes::BuildService do let(:note) { create(:discussion_note_on_issue) } let(:project) { note.project } let(:author) { note.author } diff --git a/spec/services/notes/create_service_spec.rb b/spec/services/notes/create_service_spec.rb index 39d6fd26e31..9f40070029f 100644 --- a/spec/services/notes/create_service_spec.rb +++ b/spec/services/notes/create_service_spec.rb @@ -2,7 +2,7 @@ require 'spec_helper' -describe Notes::CreateService do +RSpec.describe Notes::CreateService do let_it_be(:project) { create(:project, :repository) } let_it_be(:issue) { create(:issue, project: project) } let_it_be(:user) { create(:user) } diff --git a/spec/services/notes/destroy_service_spec.rb b/spec/services/notes/destroy_service_spec.rb index 258e5c68265..d1076f77cec 100644 --- a/spec/services/notes/destroy_service_spec.rb +++ b/spec/services/notes/destroy_service_spec.rb @@ -2,7 +2,7 @@ require 'spec_helper' -describe Notes::DestroyService do +RSpec.describe Notes::DestroyService do let_it_be(:project) { create(:project, :public) } let_it_be(:issue) { create(:issue, project: project) } let(:user) { issue.author } diff --git a/spec/services/notes/post_process_service_spec.rb b/spec/services/notes/post_process_service_spec.rb index d564cacd2d8..07ef08d36c4 100644 --- a/spec/services/notes/post_process_service_spec.rb +++ b/spec/services/notes/post_process_service_spec.rb @@ -2,7 +2,7 @@ require 'spec_helper' -describe Notes::PostProcessService do +RSpec.describe Notes::PostProcessService do let(:project) { create(:project) } let(:issue) { create(:issue, project: project) } let(:user) { create(:user) } diff --git a/spec/services/notes/quick_actions_service_spec.rb b/spec/services/notes/quick_actions_service_spec.rb index 7eea2a7afc6..d20824efaaa 100644 --- a/spec/services/notes/quick_actions_service_spec.rb +++ b/spec/services/notes/quick_actions_service_spec.rb @@ -2,7 +2,7 @@ require 'spec_helper' -describe Notes::QuickActionsService do +RSpec.describe Notes::QuickActionsService do shared_context 'note on noteable' do let(:project) { create(:project, :repository) } let(:maintainer) { create(:user).tap { |u| project.add_maintainer(u) } } diff --git a/spec/services/notes/render_service_spec.rb b/spec/services/notes/render_service_spec.rb index ad69721d876..09cd7dc572b 100644 --- a/spec/services/notes/render_service_spec.rb +++ b/spec/services/notes/render_service_spec.rb @@ -2,7 +2,7 @@ require 'spec_helper' -describe Notes::RenderService do +RSpec.describe Notes::RenderService do describe '#execute' do it 'renders a Note' do note = double(:note) diff --git a/spec/services/notes/resolve_service_spec.rb b/spec/services/notes/resolve_service_spec.rb index c98384c226e..1c5b308aed1 100644 --- a/spec/services/notes/resolve_service_spec.rb +++ b/spec/services/notes/resolve_service_spec.rb @@ -2,7 +2,7 @@ require 'spec_helper' -describe Notes::ResolveService do +RSpec.describe Notes::ResolveService do let(:merge_request) { create(:merge_request) } let(:note) { create(:diff_note_on_merge_request, noteable: merge_request, project: merge_request.project) } let(:user) { merge_request.author } diff --git a/spec/services/notes/update_service_spec.rb b/spec/services/notes/update_service_spec.rb index ab28e08ec83..08c91722c42 100644 --- a/spec/services/notes/update_service_spec.rb +++ b/spec/services/notes/update_service_spec.rb @@ -2,7 +2,7 @@ require 'spec_helper' -describe Notes::UpdateService do +RSpec.describe Notes::UpdateService do let(:group) { create(:group, :public) } let(:project) { create(:project, :public, group: group) } let(:private_group) { create(:group, :private) } diff --git a/spec/services/notification_recipients/build_service_spec.rb b/spec/services/notification_recipients/build_service_spec.rb index e203093623d..5c8add250c2 100644 --- a/spec/services/notification_recipients/build_service_spec.rb +++ b/spec/services/notification_recipients/build_service_spec.rb @@ -2,7 +2,7 @@ require 'spec_helper' -describe NotificationRecipients::BuildService do +RSpec.describe NotificationRecipients::BuildService do let(:service) { described_class } let(:assignee) { create(:user) } let(:project) { create(:project, :public) } diff --git a/spec/services/notification_recipients/builder/default_spec.rb b/spec/services/notification_recipients/builder/default_spec.rb index 307ca40248e..d25410235c2 100644 --- a/spec/services/notification_recipients/builder/default_spec.rb +++ b/spec/services/notification_recipients/builder/default_spec.rb @@ -2,7 +2,7 @@ require 'spec_helper' -describe NotificationRecipients::Builder::Default do +RSpec.describe NotificationRecipients::Builder::Default do describe '#build!' do let_it_be(:group) { create(:group, :public) } let_it_be(:project) { create(:project, :public, group: group).tap { |p| p.add_developer(project_watcher) } } diff --git a/spec/services/notification_recipients/builder/new_note_spec.rb b/spec/services/notification_recipients/builder/new_note_spec.rb index f88e8b2dfb0..7d2a4f682c5 100644 --- a/spec/services/notification_recipients/builder/new_note_spec.rb +++ b/spec/services/notification_recipients/builder/new_note_spec.rb @@ -2,7 +2,7 @@ require 'spec_helper' -describe NotificationRecipients::Builder::NewNote do +RSpec.describe NotificationRecipients::Builder::NewNote do describe '#notification_recipients' do let_it_be(:group) { create(:group, :public) } let_it_be(:project) { create(:project, :public, group: group) } diff --git a/spec/services/notification_service_spec.rb b/spec/services/notification_service_spec.rb index 3c1c3e2dfc3..e6b82acad55 100644 --- a/spec/services/notification_service_spec.rb +++ b/spec/services/notification_service_spec.rb @@ -2,7 +2,7 @@ require 'spec_helper' -describe NotificationService, :mailer do +RSpec.describe NotificationService, :mailer do include EmailSpec::Matchers include ExternalAuthorizationServiceHelpers include NotificationHelpers diff --git a/spec/services/pages/delete_services_spec.rb b/spec/services/pages/delete_services_spec.rb index c253f294e80..f6d4694b4dd 100644 --- a/spec/services/pages/delete_services_spec.rb +++ b/spec/services/pages/delete_services_spec.rb @@ -2,7 +2,7 @@ require 'spec_helper' -describe Pages::DeleteService do +RSpec.describe Pages::DeleteService do let_it_be(:project) { create(:project, path: "my.project")} let_it_be(:admin) { create(:admin) } let_it_be(:domain) { create(:pages_domain, project: project) } diff --git a/spec/services/pages_domains/create_acme_order_service_spec.rb b/spec/services/pages_domains/create_acme_order_service_spec.rb index d59aa9b979e..35b2cc56973 100644 --- a/spec/services/pages_domains/create_acme_order_service_spec.rb +++ b/spec/services/pages_domains/create_acme_order_service_spec.rb @@ -2,7 +2,7 @@ require 'spec_helper' -describe PagesDomains::CreateAcmeOrderService do +RSpec.describe PagesDomains::CreateAcmeOrderService do include LetsEncryptHelpers let(:pages_domain) { create(:pages_domain) } diff --git a/spec/services/pages_domains/obtain_lets_encrypt_certificate_service_spec.rb b/spec/services/pages_domains/obtain_lets_encrypt_certificate_service_spec.rb index 22fcc6b9a79..4d489d7fe4b 100644 --- a/spec/services/pages_domains/obtain_lets_encrypt_certificate_service_spec.rb +++ b/spec/services/pages_domains/obtain_lets_encrypt_certificate_service_spec.rb @@ -2,7 +2,7 @@ require 'spec_helper' -describe PagesDomains::ObtainLetsEncryptCertificateService do +RSpec.describe PagesDomains::ObtainLetsEncryptCertificateService do include LetsEncryptHelpers let(:pages_domain) { create(:pages_domain, :without_certificate, :without_key) } diff --git a/spec/services/pages_domains/retry_acme_order_service_spec.rb b/spec/services/pages_domains/retry_acme_order_service_spec.rb index 0185f10864c..601de24e766 100644 --- a/spec/services/pages_domains/retry_acme_order_service_spec.rb +++ b/spec/services/pages_domains/retry_acme_order_service_spec.rb @@ -2,7 +2,7 @@ require 'spec_helper' -describe PagesDomains::RetryAcmeOrderService do +RSpec.describe PagesDomains::RetryAcmeOrderService do let(:domain) { create(:pages_domain, auto_ssl_enabled: true, auto_ssl_failed: true) } let(:service) { described_class.new(domain) } diff --git a/spec/services/personal_access_tokens/create_service_spec.rb b/spec/services/personal_access_tokens/create_service_spec.rb index 9190434b96a..475ade95948 100644 --- a/spec/services/personal_access_tokens/create_service_spec.rb +++ b/spec/services/personal_access_tokens/create_service_spec.rb @@ -2,7 +2,7 @@ require 'spec_helper' -describe PersonalAccessTokens::CreateService do +RSpec.describe PersonalAccessTokens::CreateService do describe '#execute' do context 'with valid params' do it 'creates personal access token record' do diff --git a/spec/services/pod_logs/base_service_spec.rb b/spec/services/pod_logs/base_service_spec.rb index bc4989b59d9..6f7731fda3a 100644 --- a/spec/services/pod_logs/base_service_spec.rb +++ b/spec/services/pod_logs/base_service_spec.rb @@ -2,7 +2,7 @@ require 'spec_helper' -describe ::PodLogs::BaseService do +RSpec.describe ::PodLogs::BaseService do include KubernetesHelpers let_it_be(:cluster) { create(:cluster, :provided_by_gcp, environment_scope: '*') } diff --git a/spec/services/pod_logs/elasticsearch_service_spec.rb b/spec/services/pod_logs/elasticsearch_service_spec.rb index 8060d07461a..9431e47c6f2 100644 --- a/spec/services/pod_logs/elasticsearch_service_spec.rb +++ b/spec/services/pod_logs/elasticsearch_service_spec.rb @@ -2,7 +2,7 @@ require 'spec_helper' -describe ::PodLogs::ElasticsearchService do +RSpec.describe ::PodLogs::ElasticsearchService do let_it_be(:cluster) { create(:cluster, :provided_by_gcp, environment_scope: '*') } let(:namespace) { 'autodevops-deploy-9-production' } diff --git a/spec/services/pod_logs/kubernetes_service_spec.rb b/spec/services/pod_logs/kubernetes_service_spec.rb index a1f7645323b..3e31ff15c1b 100644 --- a/spec/services/pod_logs/kubernetes_service_spec.rb +++ b/spec/services/pod_logs/kubernetes_service_spec.rb @@ -2,7 +2,7 @@ require 'spec_helper' -describe ::PodLogs::KubernetesService do +RSpec.describe ::PodLogs::KubernetesService do include KubernetesHelpers let_it_be(:cluster) { create(:cluster, :provided_by_gcp, environment_scope: '*') } diff --git a/spec/services/post_receive_service_spec.rb b/spec/services/post_receive_service_spec.rb index 25f4122f134..2237dd3592f 100644 --- a/spec/services/post_receive_service_spec.rb +++ b/spec/services/post_receive_service_spec.rb @@ -2,7 +2,7 @@ require 'spec_helper' -describe PostReceiveService do +RSpec.describe PostReceiveService do include Gitlab::Routing let_it_be(:user) { create(:user) } diff --git a/spec/services/preview_markdown_service_spec.rb b/spec/services/preview_markdown_service_spec.rb index d25e9958831..2509d1300b3 100644 --- a/spec/services/preview_markdown_service_spec.rb +++ b/spec/services/preview_markdown_service_spec.rb @@ -2,7 +2,7 @@ require 'spec_helper' -describe PreviewMarkdownService do +RSpec.describe PreviewMarkdownService do let(:user) { create(:user) } let(:project) { create(:project, :repository) } diff --git a/spec/services/projects/after_import_service_spec.rb b/spec/services/projects/after_import_service_spec.rb index 82f654cea10..ae421fe847b 100644 --- a/spec/services/projects/after_import_service_spec.rb +++ b/spec/services/projects/after_import_service_spec.rb @@ -2,7 +2,7 @@ require 'spec_helper' -describe Projects::AfterImportService do +RSpec.describe Projects::AfterImportService do include GitHelpers subject { described_class.new(project) } diff --git a/spec/services/projects/after_rename_service_spec.rb b/spec/services/projects/after_rename_service_spec.rb index b81dd3d7e3f..52136b37c66 100644 --- a/spec/services/projects/after_rename_service_spec.rb +++ b/spec/services/projects/after_rename_service_spec.rb @@ -2,7 +2,7 @@ require 'spec_helper' -describe Projects::AfterRenameService do +RSpec.describe Projects::AfterRenameService do let(:rugged_config) { rugged_repo(project.repository).config } let(:legacy_storage) { Storage::LegacyProject.new(project) } let(:hashed_storage) { Storage::Hashed.new(project) } diff --git a/spec/services/projects/alerting/notify_service_spec.rb b/spec/services/projects/alerting/notify_service_spec.rb index 2f8c2049f85..9fec1fa6913 100644 --- a/spec/services/projects/alerting/notify_service_spec.rb +++ b/spec/services/projects/alerting/notify_service_spec.rb @@ -2,7 +2,7 @@ require 'spec_helper' -describe Projects::Alerting::NotifyService do +RSpec.describe Projects::Alerting::NotifyService do let_it_be(:project, reload: true) { create(:project) } before do diff --git a/spec/services/projects/auto_devops/disable_service_spec.rb b/spec/services/projects/auto_devops/disable_service_spec.rb index fb1ab3f9949..1f161990fb2 100644 --- a/spec/services/projects/auto_devops/disable_service_spec.rb +++ b/spec/services/projects/auto_devops/disable_service_spec.rb @@ -1,7 +1,7 @@ # frozen_string_literal: true require 'spec_helper' -describe Projects::AutoDevops::DisableService, '#execute' do +RSpec.describe Projects::AutoDevops::DisableService, '#execute' do let(:project) { create(:project, :repository, :auto_devops) } let(:auto_devops) { project.auto_devops } diff --git a/spec/services/projects/autocomplete_service_spec.rb b/spec/services/projects/autocomplete_service_spec.rb index b625653bc77..336aa37096a 100644 --- a/spec/services/projects/autocomplete_service_spec.rb +++ b/spec/services/projects/autocomplete_service_spec.rb @@ -2,7 +2,7 @@ require 'spec_helper' -describe Projects::AutocompleteService do +RSpec.describe Projects::AutocompleteService do describe '#issues' do describe 'confidential issues' do let(:author) { create(:user) } diff --git a/spec/services/projects/batch_open_issues_count_service_spec.rb b/spec/services/projects/batch_open_issues_count_service_spec.rb index 8cb0ce03fba..82d50604309 100644 --- a/spec/services/projects/batch_open_issues_count_service_spec.rb +++ b/spec/services/projects/batch_open_issues_count_service_spec.rb @@ -2,7 +2,7 @@ require 'spec_helper' -describe Projects::BatchOpenIssuesCountService do +RSpec.describe Projects::BatchOpenIssuesCountService do let!(:project_1) { create(:project) } let!(:project_2) { create(:project) } diff --git a/spec/services/projects/cleanup_service_spec.rb b/spec/services/projects/cleanup_service_spec.rb index 5c246854eb7..528f31456a9 100644 --- a/spec/services/projects/cleanup_service_spec.rb +++ b/spec/services/projects/cleanup_service_spec.rb @@ -2,7 +2,7 @@ require 'spec_helper' -describe Projects::CleanupService do +RSpec.describe Projects::CleanupService do let(:project) { create(:project, :repository, bfg_object_map: fixture_file_upload('spec/fixtures/bfg_object_map.txt')) } let(:object_map) { project.bfg_object_map } diff --git a/spec/services/projects/container_repository/cleanup_tags_service_spec.rb b/spec/services/projects/container_repository/cleanup_tags_service_spec.rb index 11ea7d51673..2c708e75a25 100644 --- a/spec/services/projects/container_repository/cleanup_tags_service_spec.rb +++ b/spec/services/projects/container_repository/cleanup_tags_service_spec.rb @@ -2,7 +2,7 @@ require 'spec_helper' -describe Projects::ContainerRepository::CleanupTagsService do +RSpec.describe Projects::ContainerRepository::CleanupTagsService do let_it_be(:user) { create(:user) } let_it_be(:project, reload: true) { create(:project, :private) } let_it_be(:repository) { create(:container_repository, :root, project: project) } diff --git a/spec/services/projects/container_repository/delete_tags_service_spec.rb b/spec/services/projects/container_repository/delete_tags_service_spec.rb index e17e4b6f7c9..91d3e96cd53 100644 --- a/spec/services/projects/container_repository/delete_tags_service_spec.rb +++ b/spec/services/projects/container_repository/delete_tags_service_spec.rb @@ -2,7 +2,7 @@ require 'spec_helper' -describe Projects::ContainerRepository::DeleteTagsService do +RSpec.describe Projects::ContainerRepository::DeleteTagsService do let_it_be(:user) { create(:user) } let_it_be(:project) { create(:project, :private) } let_it_be(:repository) { create(:container_repository, :root, project: project) } diff --git a/spec/services/projects/container_repository/destroy_service_spec.rb b/spec/services/projects/container_repository/destroy_service_spec.rb index 753b7540d7f..20e75d94e05 100644 --- a/spec/services/projects/container_repository/destroy_service_spec.rb +++ b/spec/services/projects/container_repository/destroy_service_spec.rb @@ -2,7 +2,7 @@ require 'spec_helper' -describe Projects::ContainerRepository::DestroyService do +RSpec.describe Projects::ContainerRepository::DestroyService do let_it_be(:user) { create(:user) } let_it_be(:project) { create(:project, :private) } diff --git a/spec/services/projects/count_service_spec.rb b/spec/services/projects/count_service_spec.rb index e345b508f53..11b2b57a277 100644 --- a/spec/services/projects/count_service_spec.rb +++ b/spec/services/projects/count_service_spec.rb @@ -2,7 +2,7 @@ require 'spec_helper' -describe Projects::CountService do +RSpec.describe Projects::CountService do let(:project) { build(:project, id: 1) } let(:service) { described_class.new(project) } diff --git a/spec/services/projects/create_from_template_service_spec.rb b/spec/services/projects/create_from_template_service_spec.rb index 0b4772e8f02..7e23daabcd3 100644 --- a/spec/services/projects/create_from_template_service_spec.rb +++ b/spec/services/projects/create_from_template_service_spec.rb @@ -2,7 +2,7 @@ require 'spec_helper' -describe Projects::CreateFromTemplateService do +RSpec.describe Projects::CreateFromTemplateService do let(:user) { create(:user) } let(:template_name) { 'rails' } let(:project_params) do diff --git a/spec/services/projects/create_service_spec.rb b/spec/services/projects/create_service_spec.rb index e70ee05ed31..4bc284ccb29 100644 --- a/spec/services/projects/create_service_spec.rb +++ b/spec/services/projects/create_service_spec.rb @@ -2,7 +2,7 @@ require 'spec_helper' -describe Projects::CreateService, '#execute' do +RSpec.describe Projects::CreateService, '#execute' do include ExternalAuthorizationServiceHelpers include GitHelpers diff --git a/spec/services/projects/deploy_tokens/create_service_spec.rb b/spec/services/projects/deploy_tokens/create_service_spec.rb index 5c3ada8af4e..831dbc06588 100644 --- a/spec/services/projects/deploy_tokens/create_service_spec.rb +++ b/spec/services/projects/deploy_tokens/create_service_spec.rb @@ -2,7 +2,7 @@ require 'spec_helper' -describe Projects::DeployTokens::CreateService do +RSpec.describe Projects::DeployTokens::CreateService do it_behaves_like 'a deploy token creation service' do let(:entity) { create(:project) } let(:deploy_token_class) { ProjectDeployToken } diff --git a/spec/services/projects/deploy_tokens/destroy_service_spec.rb b/spec/services/projects/deploy_tokens/destroy_service_spec.rb index 24407f46615..edb2345aa6c 100644 --- a/spec/services/projects/deploy_tokens/destroy_service_spec.rb +++ b/spec/services/projects/deploy_tokens/destroy_service_spec.rb @@ -2,7 +2,7 @@ require 'spec_helper' -describe Projects::DeployTokens::DestroyService do +RSpec.describe Projects::DeployTokens::DestroyService do it_behaves_like 'a deploy token deletion service' do let_it_be(:entity) { create(:project) } let_it_be(:deploy_token_class) { ProjectDeployToken } diff --git a/spec/services/projects/destroy_rollback_service_spec.rb b/spec/services/projects/destroy_rollback_service_spec.rb index 8facf17dc45..f63939337b8 100644 --- a/spec/services/projects/destroy_rollback_service_spec.rb +++ b/spec/services/projects/destroy_rollback_service_spec.rb @@ -2,7 +2,7 @@ require 'spec_helper' -describe Projects::DestroyRollbackService do +RSpec.describe Projects::DestroyRollbackService do let_it_be(:user) { create(:user) } let_it_be(:project) { create(:project, :repository, namespace: user.namespace) } let(:repository) { project.repository } diff --git a/spec/services/projects/destroy_service_spec.rb b/spec/services/projects/destroy_service_spec.rb index 58c40d04fe9..56b19c33ece 100644 --- a/spec/services/projects/destroy_service_spec.rb +++ b/spec/services/projects/destroy_service_spec.rb @@ -2,7 +2,7 @@ require 'spec_helper' -describe Projects::DestroyService do +RSpec.describe Projects::DestroyService do include ProjectForksHelper let_it_be(:user) { create(:user) } diff --git a/spec/services/projects/detect_repository_languages_service_spec.rb b/spec/services/projects/detect_repository_languages_service_spec.rb index 76600b0e77c..cf4c7a5024d 100644 --- a/spec/services/projects/detect_repository_languages_service_spec.rb +++ b/spec/services/projects/detect_repository_languages_service_spec.rb @@ -2,7 +2,7 @@ require 'spec_helper' -describe Projects::DetectRepositoryLanguagesService, :clean_gitlab_redis_shared_state do +RSpec.describe Projects::DetectRepositoryLanguagesService, :clean_gitlab_redis_shared_state do let_it_be(:project, reload: true) { create(:project, :repository) } subject { described_class.new(project) } diff --git a/spec/services/projects/download_service_spec.rb b/spec/services/projects/download_service_spec.rb index 06efc2ff825..0f743eaa7f5 100644 --- a/spec/services/projects/download_service_spec.rb +++ b/spec/services/projects/download_service_spec.rb @@ -2,7 +2,7 @@ require 'spec_helper' -describe Projects::DownloadService do +RSpec.describe Projects::DownloadService do describe 'File service' do before do @user = create(:user) diff --git a/spec/services/projects/enable_deploy_key_service_spec.rb b/spec/services/projects/enable_deploy_key_service_spec.rb index 64de373d7f6..f297ec374cf 100644 --- a/spec/services/projects/enable_deploy_key_service_spec.rb +++ b/spec/services/projects/enable_deploy_key_service_spec.rb @@ -2,7 +2,7 @@ require 'spec_helper' -describe Projects::EnableDeployKeyService do +RSpec.describe Projects::EnableDeployKeyService do let(:deploy_key) { create(:deploy_key, public: true) } let(:project) { create(:project) } let(:user) { project.creator} diff --git a/spec/services/projects/fetch_statistics_increment_service_spec.rb b/spec/services/projects/fetch_statistics_increment_service_spec.rb index fcfb138aad6..16121a42c39 100644 --- a/spec/services/projects/fetch_statistics_increment_service_spec.rb +++ b/spec/services/projects/fetch_statistics_increment_service_spec.rb @@ -3,7 +3,7 @@ require 'spec_helper' module Projects - describe FetchStatisticsIncrementService do + RSpec.describe FetchStatisticsIncrementService do let(:project) { create(:project) } describe '#execute' do diff --git a/spec/services/projects/fork_service_spec.rb b/spec/services/projects/fork_service_spec.rb index 112a41c773b..3fa704ccdeb 100644 --- a/spec/services/projects/fork_service_spec.rb +++ b/spec/services/projects/fork_service_spec.rb @@ -2,7 +2,7 @@ require 'spec_helper' -describe Projects::ForkService do +RSpec.describe Projects::ForkService do include ProjectForksHelper shared_examples 'forks count cache refresh' do diff --git a/spec/services/projects/forks_count_service_spec.rb b/spec/services/projects/forks_count_service_spec.rb index 21a75eafc7a..31662f78973 100644 --- a/spec/services/projects/forks_count_service_spec.rb +++ b/spec/services/projects/forks_count_service_spec.rb @@ -2,7 +2,7 @@ require 'spec_helper' -describe Projects::ForksCountService, :use_clean_rails_memory_store_caching do +RSpec.describe Projects::ForksCountService, :use_clean_rails_memory_store_caching do let(:project) { build(:project) } subject { described_class.new(project) } diff --git a/spec/services/projects/git_deduplication_service_spec.rb b/spec/services/projects/git_deduplication_service_spec.rb index 9e6279da7de..c6396b523c8 100644 --- a/spec/services/projects/git_deduplication_service_spec.rb +++ b/spec/services/projects/git_deduplication_service_spec.rb @@ -2,7 +2,7 @@ require 'spec_helper' -describe Projects::GitDeduplicationService do +RSpec.describe Projects::GitDeduplicationService do include ExclusiveLeaseHelpers let(:pool) { create(:pool_repository, :ready) } diff --git a/spec/services/projects/gitlab_projects_import_service_spec.rb b/spec/services/projects/gitlab_projects_import_service_spec.rb index 1662d4577aa..09d093a9916 100644 --- a/spec/services/projects/gitlab_projects_import_service_spec.rb +++ b/spec/services/projects/gitlab_projects_import_service_spec.rb @@ -2,7 +2,7 @@ require 'spec_helper' -describe Projects::GitlabProjectsImportService do +RSpec.describe Projects::GitlabProjectsImportService do let_it_be(:namespace) { create(:namespace) } let(:path) { 'test-path' } let(:file) { fixture_file_upload('spec/fixtures/project_export.tar.gz') } diff --git a/spec/services/projects/group_links/create_service_spec.rb b/spec/services/projects/group_links/create_service_spec.rb index 19ce17c73d6..6468e3007c2 100644 --- a/spec/services/projects/group_links/create_service_spec.rb +++ b/spec/services/projects/group_links/create_service_spec.rb @@ -2,7 +2,7 @@ require 'spec_helper' -describe Projects::GroupLinks::CreateService, '#execute' do +RSpec.describe Projects::GroupLinks::CreateService, '#execute' do let_it_be(:user) { create :user } let_it_be(:group) { create :group } let_it_be(:project) { create :project } diff --git a/spec/services/projects/group_links/destroy_service_spec.rb b/spec/services/projects/group_links/destroy_service_spec.rb index 0a8c9580e70..459b79b2d7d 100644 --- a/spec/services/projects/group_links/destroy_service_spec.rb +++ b/spec/services/projects/group_links/destroy_service_spec.rb @@ -2,7 +2,7 @@ require 'spec_helper' -describe Projects::GroupLinks::DestroyService, '#execute' do +RSpec.describe Projects::GroupLinks::DestroyService, '#execute' do let_it_be(:user) { create :user } let_it_be(:project) { create(:project, :private) } let_it_be(:group) { create(:group) } diff --git a/spec/services/projects/group_links/update_service_spec.rb b/spec/services/projects/group_links/update_service_spec.rb index 5be2ae1e0f7..053c5eb611e 100644 --- a/spec/services/projects/group_links/update_service_spec.rb +++ b/spec/services/projects/group_links/update_service_spec.rb @@ -2,7 +2,7 @@ require 'spec_helper' -describe Projects::GroupLinks::UpdateService, '#execute' do +RSpec.describe Projects::GroupLinks::UpdateService, '#execute' do let_it_be(:user) { create :user } let_it_be(:group) { create :group } let_it_be(:project) { create :project } diff --git a/spec/services/projects/hashed_storage/base_attachment_service_spec.rb b/spec/services/projects/hashed_storage/base_attachment_service_spec.rb index 070dd5fc1b8..5e1b6f2e404 100644 --- a/spec/services/projects/hashed_storage/base_attachment_service_spec.rb +++ b/spec/services/projects/hashed_storage/base_attachment_service_spec.rb @@ -2,7 +2,7 @@ require 'spec_helper' -describe Projects::HashedStorage::BaseAttachmentService do +RSpec.describe Projects::HashedStorage::BaseAttachmentService do let(:project) { create(:project, :repository, storage_version: 0, skip_disk_validation: true) } subject(:service) { described_class.new(project: project, old_disk_path: project.full_path, logger: nil) } diff --git a/spec/services/projects/hashed_storage/migrate_attachments_service_spec.rb b/spec/services/projects/hashed_storage/migrate_attachments_service_spec.rb index 7c7e188a12d..c8f24c6ce00 100644 --- a/spec/services/projects/hashed_storage/migrate_attachments_service_spec.rb +++ b/spec/services/projects/hashed_storage/migrate_attachments_service_spec.rb @@ -2,7 +2,7 @@ require 'spec_helper' -describe Projects::HashedStorage::MigrateAttachmentsService do +RSpec.describe Projects::HashedStorage::MigrateAttachmentsService do subject(:service) { described_class.new(project: project, old_disk_path: project.full_path, logger: nil) } let(:project) { create(:project, :repository, storage_version: 1, skip_disk_validation: true) } diff --git a/spec/services/projects/hashed_storage/migrate_repository_service_spec.rb b/spec/services/projects/hashed_storage/migrate_repository_service_spec.rb index f1eaf8324e0..e03e75653ff 100644 --- a/spec/services/projects/hashed_storage/migrate_repository_service_spec.rb +++ b/spec/services/projects/hashed_storage/migrate_repository_service_spec.rb @@ -2,7 +2,7 @@ require 'spec_helper' -describe Projects::HashedStorage::MigrateRepositoryService do +RSpec.describe Projects::HashedStorage::MigrateRepositoryService do include GitHelpers let(:gitlab_shell) { Gitlab::Shell.new } diff --git a/spec/services/projects/hashed_storage/migration_service_spec.rb b/spec/services/projects/hashed_storage/migration_service_spec.rb index 0a7975305dc..ef96c17dd85 100644 --- a/spec/services/projects/hashed_storage/migration_service_spec.rb +++ b/spec/services/projects/hashed_storage/migration_service_spec.rb @@ -2,7 +2,7 @@ require 'spec_helper' -describe Projects::HashedStorage::MigrationService do +RSpec.describe Projects::HashedStorage::MigrationService do let(:project) { create(:project, :empty_repo, :wiki_repo, :legacy_storage) } let(:logger) { double } let!(:project_attachment) { build(:file_uploader, project: project) } diff --git a/spec/services/projects/hashed_storage/rollback_attachments_service_spec.rb b/spec/services/projects/hashed_storage/rollback_attachments_service_spec.rb index 54695e6e48f..d4cb46c82ad 100644 --- a/spec/services/projects/hashed_storage/rollback_attachments_service_spec.rb +++ b/spec/services/projects/hashed_storage/rollback_attachments_service_spec.rb @@ -2,7 +2,7 @@ require 'spec_helper' -describe Projects::HashedStorage::RollbackAttachmentsService do +RSpec.describe Projects::HashedStorage::RollbackAttachmentsService do subject(:service) { described_class.new(project: project, old_disk_path: project.disk_path, logger: nil) } let(:project) { create(:project, :repository, skip_disk_validation: true) } diff --git a/spec/services/projects/hashed_storage/rollback_repository_service_spec.rb b/spec/services/projects/hashed_storage/rollback_repository_service_spec.rb index 1c0f446d9cf..f2b1ce30a54 100644 --- a/spec/services/projects/hashed_storage/rollback_repository_service_spec.rb +++ b/spec/services/projects/hashed_storage/rollback_repository_service_spec.rb @@ -2,7 +2,7 @@ require 'spec_helper' -describe Projects::HashedStorage::RollbackRepositoryService, :clean_gitlab_redis_shared_state do +RSpec.describe Projects::HashedStorage::RollbackRepositoryService, :clean_gitlab_redis_shared_state do include GitHelpers let(:gitlab_shell) { Gitlab::Shell.new } diff --git a/spec/services/projects/hashed_storage/rollback_service_spec.rb b/spec/services/projects/hashed_storage/rollback_service_spec.rb index e6b7daba99e..0bd63f2da2a 100644 --- a/spec/services/projects/hashed_storage/rollback_service_spec.rb +++ b/spec/services/projects/hashed_storage/rollback_service_spec.rb @@ -2,7 +2,7 @@ require 'spec_helper' -describe Projects::HashedStorage::RollbackService do +RSpec.describe Projects::HashedStorage::RollbackService do let(:project) { create(:project, :empty_repo, :wiki_repo) } let(:logger) { double } let!(:project_attachment) { build(:file_uploader, project: project) } diff --git a/spec/services/projects/housekeeping_service_spec.rb b/spec/services/projects/housekeeping_service_spec.rb index 98a27a71c26..18871f010f8 100644 --- a/spec/services/projects/housekeeping_service_spec.rb +++ b/spec/services/projects/housekeeping_service_spec.rb @@ -2,7 +2,7 @@ require 'spec_helper' -describe Projects::HousekeepingService do +RSpec.describe Projects::HousekeepingService do subject { described_class.new(project) } let_it_be(:project) { create(:project, :repository) } diff --git a/spec/services/projects/import_error_filter_spec.rb b/spec/services/projects/import_error_filter_spec.rb index 312b658de89..fd31cd52cc4 100644 --- a/spec/services/projects/import_error_filter_spec.rb +++ b/spec/services/projects/import_error_filter_spec.rb @@ -2,7 +2,7 @@ require 'spec_helper' -describe Projects::ImportErrorFilter do +RSpec.describe Projects::ImportErrorFilter do it 'filters any full paths' do message = 'Error importing into /my/folder Permission denied @ unlink_internal - /var/opt/gitlab/gitlab-rails/shared/a/b/c/uploads/file' diff --git a/spec/services/projects/import_export/export_service_spec.rb b/spec/services/projects/import_export/export_service_spec.rb index 19891341311..111c1264777 100644 --- a/spec/services/projects/import_export/export_service_spec.rb +++ b/spec/services/projects/import_export/export_service_spec.rb @@ -2,7 +2,7 @@ require 'spec_helper' -describe Projects::ImportExport::ExportService do +RSpec.describe Projects::ImportExport::ExportService do describe '#execute' do let!(:user) { create(:user) } let(:project) { create(:project) } diff --git a/spec/services/projects/import_service_spec.rb b/spec/services/projects/import_service_spec.rb index ca6750b373d..92e18b6cb46 100644 --- a/spec/services/projects/import_service_spec.rb +++ b/spec/services/projects/import_service_spec.rb @@ -2,7 +2,7 @@ require 'spec_helper' -describe Projects::ImportService do +RSpec.describe Projects::ImportService do let!(:project) { create(:project) } let(:user) { project.creator } diff --git a/spec/services/projects/lfs_pointers/lfs_download_link_list_service_spec.rb b/spec/services/projects/lfs_pointers/lfs_download_link_list_service_spec.rb index 99d35fdc7f7..66a450bd734 100644 --- a/spec/services/projects/lfs_pointers/lfs_download_link_list_service_spec.rb +++ b/spec/services/projects/lfs_pointers/lfs_download_link_list_service_spec.rb @@ -1,7 +1,7 @@ # frozen_string_literal: true require 'spec_helper' -describe Projects::LfsPointers::LfsDownloadLinkListService do +RSpec.describe Projects::LfsPointers::LfsDownloadLinkListService do let(:import_url) { 'http://www.gitlab.com/demo/repo.git' } let(:lfs_endpoint) { "#{import_url}/info/lfs/objects/batch" } let!(:project) { create(:project, import_url: import_url) } diff --git a/spec/services/projects/lfs_pointers/lfs_download_service_spec.rb b/spec/services/projects/lfs_pointers/lfs_download_service_spec.rb index 496d1fe67f2..a606371099d 100644 --- a/spec/services/projects/lfs_pointers/lfs_download_service_spec.rb +++ b/spec/services/projects/lfs_pointers/lfs_download_service_spec.rb @@ -1,7 +1,7 @@ # frozen_string_literal: true require 'spec_helper' -describe Projects::LfsPointers::LfsDownloadService do +RSpec.describe Projects::LfsPointers::LfsDownloadService do include StubRequests let(:project) { create(:project) } diff --git a/spec/services/projects/lfs_pointers/lfs_import_service_spec.rb b/spec/services/projects/lfs_pointers/lfs_import_service_spec.rb index 016028a96bf..b36b0b8d6b2 100644 --- a/spec/services/projects/lfs_pointers/lfs_import_service_spec.rb +++ b/spec/services/projects/lfs_pointers/lfs_import_service_spec.rb @@ -1,7 +1,7 @@ # frozen_string_literal: true require 'spec_helper' -describe Projects::LfsPointers::LfsImportService do +RSpec.describe Projects::LfsPointers::LfsImportService do let(:project) { create(:project) } let(:user) { project.creator } let(:import_url) { 'http://www.gitlab.com/demo/repo.git' } diff --git a/spec/services/projects/lfs_pointers/lfs_link_service_spec.rb b/spec/services/projects/lfs_pointers/lfs_link_service_spec.rb index b64662f3782..d59f5dbae19 100644 --- a/spec/services/projects/lfs_pointers/lfs_link_service_spec.rb +++ b/spec/services/projects/lfs_pointers/lfs_link_service_spec.rb @@ -1,7 +1,7 @@ # frozen_string_literal: true require 'spec_helper' -describe Projects::LfsPointers::LfsLinkService do +RSpec.describe Projects::LfsPointers::LfsLinkService do let!(:project) { create(:project, lfs_enabled: true) } let!(:lfs_objects_project) { create_list(:lfs_objects_project, 2, project: project) } let(:new_oids) { { 'oid1' => 123, 'oid2' => 125 } } diff --git a/spec/services/projects/lfs_pointers/lfs_object_download_list_service_spec.rb b/spec/services/projects/lfs_pointers/lfs_object_download_list_service_spec.rb index e94d8a85987..0799a33f856 100644 --- a/spec/services/projects/lfs_pointers/lfs_object_download_list_service_spec.rb +++ b/spec/services/projects/lfs_pointers/lfs_object_download_list_service_spec.rb @@ -1,7 +1,7 @@ # frozen_string_literal: true require 'spec_helper' -describe Projects::LfsPointers::LfsObjectDownloadListService do +RSpec.describe Projects::LfsPointers::LfsObjectDownloadListService do let(:import_url) { 'http://www.gitlab.com/demo/repo.git' } let(:default_endpoint) { "#{import_url}/info/lfs/objects/batch"} let(:group) { create(:group, lfs_enabled: true)} diff --git a/spec/services/projects/move_access_service_spec.rb b/spec/services/projects/move_access_service_spec.rb index efa34c84522..de3871414af 100644 --- a/spec/services/projects/move_access_service_spec.rb +++ b/spec/services/projects/move_access_service_spec.rb @@ -2,7 +2,7 @@ require 'spec_helper' -describe Projects::MoveAccessService do +RSpec.describe Projects::MoveAccessService do let(:user) { create(:user) } let(:group) { create(:group) } let(:project_with_access) { create(:project, namespace: user.namespace) } diff --git a/spec/services/projects/move_deploy_keys_projects_service_spec.rb b/spec/services/projects/move_deploy_keys_projects_service_spec.rb index a5d28fb0fbf..e69b4dd4fc7 100644 --- a/spec/services/projects/move_deploy_keys_projects_service_spec.rb +++ b/spec/services/projects/move_deploy_keys_projects_service_spec.rb @@ -2,7 +2,7 @@ require 'spec_helper' -describe Projects::MoveDeployKeysProjectsService do +RSpec.describe Projects::MoveDeployKeysProjectsService do let!(:user) { create(:user) } let!(:project_with_deploy_keys) { create(:project, namespace: user.namespace) } let!(:target_project) { create(:project, namespace: user.namespace) } diff --git a/spec/services/projects/move_forks_service_spec.rb b/spec/services/projects/move_forks_service_spec.rb index 8f9f048d5ff..7d3637b7758 100644 --- a/spec/services/projects/move_forks_service_spec.rb +++ b/spec/services/projects/move_forks_service_spec.rb @@ -2,7 +2,7 @@ require 'spec_helper' -describe Projects::MoveForksService do +RSpec.describe Projects::MoveForksService do include ProjectForksHelper let!(:user) { create(:user) } diff --git a/spec/services/projects/move_lfs_objects_projects_service_spec.rb b/spec/services/projects/move_lfs_objects_projects_service_spec.rb index 114509229c5..b73286fba9a 100644 --- a/spec/services/projects/move_lfs_objects_projects_service_spec.rb +++ b/spec/services/projects/move_lfs_objects_projects_service_spec.rb @@ -2,7 +2,7 @@ require 'spec_helper' -describe Projects::MoveLfsObjectsProjectsService do +RSpec.describe Projects::MoveLfsObjectsProjectsService do let!(:user) { create(:user) } let!(:project_with_lfs_objects) { create(:project, namespace: user.namespace) } let!(:target_project) { create(:project, namespace: user.namespace) } diff --git a/spec/services/projects/move_notification_settings_service_spec.rb b/spec/services/projects/move_notification_settings_service_spec.rb index 54d85404bf6..7c9f1dd30d2 100644 --- a/spec/services/projects/move_notification_settings_service_spec.rb +++ b/spec/services/projects/move_notification_settings_service_spec.rb @@ -2,7 +2,7 @@ require 'spec_helper' -describe Projects::MoveNotificationSettingsService do +RSpec.describe Projects::MoveNotificationSettingsService do let(:user) { create(:user) } let(:project_with_notifications) { create(:project, namespace: user.namespace) } let(:target_project) { create(:project, namespace: user.namespace) } diff --git a/spec/services/projects/move_project_authorizations_service_spec.rb b/spec/services/projects/move_project_authorizations_service_spec.rb index fe3ba31c881..a37b4d807a0 100644 --- a/spec/services/projects/move_project_authorizations_service_spec.rb +++ b/spec/services/projects/move_project_authorizations_service_spec.rb @@ -2,7 +2,7 @@ require 'spec_helper' -describe Projects::MoveProjectAuthorizationsService do +RSpec.describe Projects::MoveProjectAuthorizationsService do let!(:user) { create(:user) } let(:project_with_users) { create(:project, namespace: user.namespace) } let(:target_project) { create(:project, namespace: user.namespace) } diff --git a/spec/services/projects/move_project_group_links_service_spec.rb b/spec/services/projects/move_project_group_links_service_spec.rb index 6140d679929..196a8f2b339 100644 --- a/spec/services/projects/move_project_group_links_service_spec.rb +++ b/spec/services/projects/move_project_group_links_service_spec.rb @@ -2,7 +2,7 @@ require 'spec_helper' -describe Projects::MoveProjectGroupLinksService do +RSpec.describe Projects::MoveProjectGroupLinksService do let!(:user) { create(:user) } let(:project_with_groups) { create(:project, namespace: user.namespace) } let(:target_project) { create(:project, namespace: user.namespace) } diff --git a/spec/services/projects/move_project_members_service_spec.rb b/spec/services/projects/move_project_members_service_spec.rb index bdd5cd6a87a..f14f00e3866 100644 --- a/spec/services/projects/move_project_members_service_spec.rb +++ b/spec/services/projects/move_project_members_service_spec.rb @@ -2,7 +2,7 @@ require 'spec_helper' -describe Projects::MoveProjectMembersService do +RSpec.describe Projects::MoveProjectMembersService do let!(:user) { create(:user) } let(:project_with_users) { create(:project, namespace: user.namespace) } let(:target_project) { create(:project, namespace: user.namespace) } diff --git a/spec/services/projects/move_users_star_projects_service_spec.rb b/spec/services/projects/move_users_star_projects_service_spec.rb index cde188f9f5f..0f766ebd0ec 100644 --- a/spec/services/projects/move_users_star_projects_service_spec.rb +++ b/spec/services/projects/move_users_star_projects_service_spec.rb @@ -2,7 +2,7 @@ require 'spec_helper' -describe Projects::MoveUsersStarProjectsService do +RSpec.describe Projects::MoveUsersStarProjectsService do let!(:user) { create(:user) } let!(:project_with_stars) { create(:project, namespace: user.namespace) } let!(:target_project) { create(:project, namespace: user.namespace) } diff --git a/spec/services/projects/open_issues_count_service_spec.rb b/spec/services/projects/open_issues_count_service_spec.rb index c1d49befeb9..c739fea5ecf 100644 --- a/spec/services/projects/open_issues_count_service_spec.rb +++ b/spec/services/projects/open_issues_count_service_spec.rb @@ -2,7 +2,7 @@ require 'spec_helper' -describe Projects::OpenIssuesCountService, :use_clean_rails_memory_store_caching do +RSpec.describe Projects::OpenIssuesCountService, :use_clean_rails_memory_store_caching do let(:project) { create(:project) } subject { described_class.new(project) } diff --git a/spec/services/projects/open_merge_requests_count_service_spec.rb b/spec/services/projects/open_merge_requests_count_service_spec.rb index 7d848f9f2c3..6caef181e77 100644 --- a/spec/services/projects/open_merge_requests_count_service_spec.rb +++ b/spec/services/projects/open_merge_requests_count_service_spec.rb @@ -2,7 +2,7 @@ require 'spec_helper' -describe Projects::OpenMergeRequestsCountService, :use_clean_rails_memory_store_caching do +RSpec.describe Projects::OpenMergeRequestsCountService, :use_clean_rails_memory_store_caching do let_it_be(:project) { create(:project) } subject { described_class.new(project) } diff --git a/spec/services/projects/operations/update_service_spec.rb b/spec/services/projects/operations/update_service_spec.rb index f4d62b48fe5..3cfc9844d65 100644 --- a/spec/services/projects/operations/update_service_spec.rb +++ b/spec/services/projects/operations/update_service_spec.rb @@ -2,7 +2,7 @@ require 'spec_helper' -describe Projects::Operations::UpdateService do +RSpec.describe Projects::Operations::UpdateService do let_it_be(:user) { create(:user) } let_it_be(:project, refind: true) { create(:project) } diff --git a/spec/services/projects/overwrite_project_service_spec.rb b/spec/services/projects/overwrite_project_service_spec.rb index def39ad3789..e4495da9807 100644 --- a/spec/services/projects/overwrite_project_service_spec.rb +++ b/spec/services/projects/overwrite_project_service_spec.rb @@ -2,7 +2,7 @@ require 'spec_helper' -describe Projects::OverwriteProjectService do +RSpec.describe Projects::OverwriteProjectService do include ProjectForksHelper let(:user) { create(:user) } diff --git a/spec/services/projects/participants_service_spec.rb b/spec/services/projects/participants_service_spec.rb index f4a04159db4..33a3e37a2d2 100644 --- a/spec/services/projects/participants_service_spec.rb +++ b/spec/services/projects/participants_service_spec.rb @@ -2,7 +2,7 @@ require 'spec_helper' -describe Projects::ParticipantsService do +RSpec.describe Projects::ParticipantsService do describe '#groups' do let_it_be(:user) { create(:user) } let_it_be(:project) { create(:project, :public) } diff --git a/spec/services/projects/prometheus/alerts/create_events_service_spec.rb b/spec/services/projects/prometheus/alerts/create_events_service_spec.rb index 61236b5bbdb..c23f2d8c817 100644 --- a/spec/services/projects/prometheus/alerts/create_events_service_spec.rb +++ b/spec/services/projects/prometheus/alerts/create_events_service_spec.rb @@ -2,7 +2,7 @@ require 'spec_helper' -describe Projects::Prometheus::Alerts::CreateEventsService do +RSpec.describe Projects::Prometheus::Alerts::CreateEventsService do let(:user) { create(:user) } let_it_be(:project) { create(:project) } let(:metric) { create(:prometheus_metric, project: project) } diff --git a/spec/services/projects/prometheus/alerts/create_service_spec.rb b/spec/services/projects/prometheus/alerts/create_service_spec.rb index 50c776df734..c0bc9336558 100644 --- a/spec/services/projects/prometheus/alerts/create_service_spec.rb +++ b/spec/services/projects/prometheus/alerts/create_service_spec.rb @@ -2,7 +2,7 @@ require 'spec_helper' -describe Projects::Prometheus::Alerts::CreateService do +RSpec.describe Projects::Prometheus::Alerts::CreateService do let_it_be(:project) { create(:project) } let_it_be(:user) { create(:user) } diff --git a/spec/services/projects/prometheus/alerts/destroy_service_spec.rb b/spec/services/projects/prometheus/alerts/destroy_service_spec.rb index 7205ace8308..573711051b7 100644 --- a/spec/services/projects/prometheus/alerts/destroy_service_spec.rb +++ b/spec/services/projects/prometheus/alerts/destroy_service_spec.rb @@ -2,7 +2,7 @@ require 'spec_helper' -describe Projects::Prometheus::Alerts::DestroyService do +RSpec.describe Projects::Prometheus::Alerts::DestroyService do let_it_be(:project) { create(:project) } let_it_be(:user) { create(:user) } let_it_be(:alert) { create(:prometheus_alert, project: project) } diff --git a/spec/services/projects/prometheus/alerts/notify_service_spec.rb b/spec/services/projects/prometheus/alerts/notify_service_spec.rb index 95acedb1e76..852382dd0d8 100644 --- a/spec/services/projects/prometheus/alerts/notify_service_spec.rb +++ b/spec/services/projects/prometheus/alerts/notify_service_spec.rb @@ -2,7 +2,7 @@ require 'spec_helper' -describe Projects::Prometheus::Alerts::NotifyService do +RSpec.describe Projects::Prometheus::Alerts::NotifyService do include PrometheusHelpers let_it_be(:project, reload: true) { create(:project) } diff --git a/spec/services/projects/prometheus/alerts/update_service_spec.rb b/spec/services/projects/prometheus/alerts/update_service_spec.rb index 8a99c2679f7..e831d001838 100644 --- a/spec/services/projects/prometheus/alerts/update_service_spec.rb +++ b/spec/services/projects/prometheus/alerts/update_service_spec.rb @@ -2,7 +2,7 @@ require 'spec_helper' -describe Projects::Prometheus::Alerts::UpdateService do +RSpec.describe Projects::Prometheus::Alerts::UpdateService do let_it_be(:project) { create(:project) } let_it_be(:user) { create(:user) } let_it_be(:environment) { create(:environment, project: project) } diff --git a/spec/services/projects/prometheus/metrics/destroy_service_spec.rb b/spec/services/projects/prometheus/metrics/destroy_service_spec.rb index 81fce82cf46..17cc88b27b6 100644 --- a/spec/services/projects/prometheus/metrics/destroy_service_spec.rb +++ b/spec/services/projects/prometheus/metrics/destroy_service_spec.rb @@ -2,7 +2,7 @@ require 'spec_helper' -describe Projects::Prometheus::Metrics::DestroyService do +RSpec.describe Projects::Prometheus::Metrics::DestroyService do let(:metric) { create(:prometheus_metric) } subject { described_class.new(metric) } diff --git a/spec/services/projects/prometheus/metrics/update_service_spec.rb b/spec/services/projects/prometheus/metrics/update_service_spec.rb index a53c6ae37cd..bf87093150c 100644 --- a/spec/services/projects/prometheus/metrics/update_service_spec.rb +++ b/spec/services/projects/prometheus/metrics/update_service_spec.rb @@ -2,7 +2,7 @@ require 'spec_helper' -describe Projects::Prometheus::Metrics::UpdateService do +RSpec.describe Projects::Prometheus::Metrics::UpdateService do let(:metric) { create(:prometheus_metric) } it 'updates the prometheus metric' do diff --git a/spec/services/projects/propagate_service_template_spec.rb b/spec/services/projects/propagate_service_template_spec.rb index ddc27c037f8..266bf2cc213 100644 --- a/spec/services/projects/propagate_service_template_spec.rb +++ b/spec/services/projects/propagate_service_template_spec.rb @@ -2,7 +2,7 @@ require 'spec_helper' -describe Projects::PropagateServiceTemplate do +RSpec.describe Projects::PropagateServiceTemplate do describe '.propagate' do let!(:service_template) do PushoverService.create( diff --git a/spec/services/projects/protect_default_branch_service_spec.rb b/spec/services/projects/protect_default_branch_service_spec.rb index c0b819ab17b..a485a64ca35 100644 --- a/spec/services/projects/protect_default_branch_service_spec.rb +++ b/spec/services/projects/protect_default_branch_service_spec.rb @@ -2,7 +2,7 @@ require 'spec_helper' -describe Projects::ProtectDefaultBranchService do +RSpec.describe Projects::ProtectDefaultBranchService do let(:service) { described_class.new(project) } let(:project) { create(:project) } diff --git a/spec/services/projects/repository_languages_service_spec.rb b/spec/services/projects/repository_languages_service_spec.rb index 46c5095327d..cb61a7a1a3e 100644 --- a/spec/services/projects/repository_languages_service_spec.rb +++ b/spec/services/projects/repository_languages_service_spec.rb @@ -2,7 +2,7 @@ require 'spec_helper' -describe Projects::RepositoryLanguagesService do +RSpec.describe Projects::RepositoryLanguagesService do let(:service) { described_class.new(project, project.owner) } context 'when detected_repository_languages flag is set' do diff --git a/spec/services/projects/transfer_service_spec.rb b/spec/services/projects/transfer_service_spec.rb index 0e2431c0e44..72426a6f6ec 100644 --- a/spec/services/projects/transfer_service_spec.rb +++ b/spec/services/projects/transfer_service_spec.rb @@ -2,7 +2,7 @@ require 'spec_helper' -describe Projects::TransferService do +RSpec.describe Projects::TransferService do include GitHelpers let(:user) { create(:user) } diff --git a/spec/services/projects/unlink_fork_service_spec.rb b/spec/services/projects/unlink_fork_service_spec.rb index a6bdc69cdca..9430b1d1f8a 100644 --- a/spec/services/projects/unlink_fork_service_spec.rb +++ b/spec/services/projects/unlink_fork_service_spec.rb @@ -2,7 +2,7 @@ require 'spec_helper' -describe Projects::UnlinkForkService, :use_clean_rails_memory_store_caching do +RSpec.describe Projects::UnlinkForkService, :use_clean_rails_memory_store_caching do include ProjectForksHelper subject { described_class.new(forked_project, user) } diff --git a/spec/services/projects/update_pages_configuration_service_spec.rb b/spec/services/projects/update_pages_configuration_service_spec.rb index 363d3df0f84..c4c9fc779fa 100644 --- a/spec/services/projects/update_pages_configuration_service_spec.rb +++ b/spec/services/projects/update_pages_configuration_service_spec.rb @@ -2,7 +2,7 @@ require 'spec_helper' -describe Projects::UpdatePagesConfigurationService do +RSpec.describe Projects::UpdatePagesConfigurationService do let(:project) { create(:project) } let(:service) { described_class.new(project) } diff --git a/spec/services/projects/update_pages_service_spec.rb b/spec/services/projects/update_pages_service_spec.rb index 29c3c300d1b..2e02cb56668 100644 --- a/spec/services/projects/update_pages_service_spec.rb +++ b/spec/services/projects/update_pages_service_spec.rb @@ -2,7 +2,7 @@ require "spec_helper" -describe Projects::UpdatePagesService do +RSpec.describe Projects::UpdatePagesService do let_it_be(:project, refind: true) { create(:project, :repository) } let_it_be(:pipeline) { create(:ci_pipeline, project: project, sha: project.commit('HEAD').sha) } let(:build) { create(:ci_build, pipeline: pipeline, ref: 'HEAD') } diff --git a/spec/services/projects/update_remote_mirror_service_spec.rb b/spec/services/projects/update_remote_mirror_service_spec.rb index 418973fb0a6..f0a8074f46c 100644 --- a/spec/services/projects/update_remote_mirror_service_spec.rb +++ b/spec/services/projects/update_remote_mirror_service_spec.rb @@ -2,7 +2,7 @@ require 'spec_helper' -describe Projects::UpdateRemoteMirrorService do +RSpec.describe Projects::UpdateRemoteMirrorService do let(:project) { create(:project, :repository) } let(:remote_project) { create(:forked_project_with_submodules) } let(:remote_mirror) { create(:remote_mirror, project: project, enabled: true) } diff --git a/spec/services/projects/update_repository_storage_service_spec.rb b/spec/services/projects/update_repository_storage_service_spec.rb index 3e727f92d98..be24fc246b7 100644 --- a/spec/services/projects/update_repository_storage_service_spec.rb +++ b/spec/services/projects/update_repository_storage_service_spec.rb @@ -2,7 +2,7 @@ require 'spec_helper' -describe Projects::UpdateRepositoryStorageService do +RSpec.describe Projects::UpdateRepositoryStorageService do include Gitlab::ShellAdapter subject { described_class.new(repository_storage_move) } diff --git a/spec/services/projects/update_service_spec.rb b/spec/services/projects/update_service_spec.rb index 8a17884f641..6620ee6e697 100644 --- a/spec/services/projects/update_service_spec.rb +++ b/spec/services/projects/update_service_spec.rb @@ -2,7 +2,7 @@ require 'spec_helper' -describe Projects::UpdateService do +RSpec.describe Projects::UpdateService do include ExternalAuthorizationServiceHelpers include ProjectForksHelper diff --git a/spec/services/projects/update_statistics_service_spec.rb b/spec/services/projects/update_statistics_service_spec.rb index 8534853fbc7..92e97186be3 100644 --- a/spec/services/projects/update_statistics_service_spec.rb +++ b/spec/services/projects/update_statistics_service_spec.rb @@ -2,7 +2,7 @@ require 'spec_helper' -describe Projects::UpdateStatisticsService do +RSpec.describe Projects::UpdateStatisticsService do let(:service) { described_class.new(project, nil, statistics: statistics)} let(:statistics) { %w(repository_size) } diff --git a/spec/services/prometheus/create_default_alerts_service_spec.rb b/spec/services/prometheus/create_default_alerts_service_spec.rb index a28c38491de..e149161d881 100644 --- a/spec/services/prometheus/create_default_alerts_service_spec.rb +++ b/spec/services/prometheus/create_default_alerts_service_spec.rb @@ -2,7 +2,7 @@ require 'spec_helper' -describe Prometheus::CreateDefaultAlertsService do +RSpec.describe Prometheus::CreateDefaultAlertsService do let_it_be(:project) { create(:project, :repository) } let(:instance) { described_class.new(project: project) } let(:expected_alerts) { described_class::DEFAULT_ALERTS } diff --git a/spec/services/prometheus/proxy_service_spec.rb b/spec/services/prometheus/proxy_service_spec.rb index bd451ff00a1..f22ea361fde 100644 --- a/spec/services/prometheus/proxy_service_spec.rb +++ b/spec/services/prometheus/proxy_service_spec.rb @@ -2,7 +2,7 @@ require 'spec_helper' -describe Prometheus::ProxyService do +RSpec.describe Prometheus::ProxyService do include ReactiveCachingHelpers let_it_be(:project) { create(:project) } diff --git a/spec/services/prometheus/proxy_variable_substitution_service_spec.rb b/spec/services/prometheus/proxy_variable_substitution_service_spec.rb index 2435dda07b4..d8c1fdffb98 100644 --- a/spec/services/prometheus/proxy_variable_substitution_service_spec.rb +++ b/spec/services/prometheus/proxy_variable_substitution_service_spec.rb @@ -2,7 +2,7 @@ require 'spec_helper' -describe Prometheus::ProxyVariableSubstitutionService do +RSpec.describe Prometheus::ProxyVariableSubstitutionService do describe '#execute' do let_it_be(:environment) { create(:environment) } diff --git a/spec/services/protected_branches/create_service_spec.rb b/spec/services/protected_branches/create_service_spec.rb index 82d24ec43f6..986322e4d87 100644 --- a/spec/services/protected_branches/create_service_spec.rb +++ b/spec/services/protected_branches/create_service_spec.rb @@ -2,7 +2,7 @@ require 'spec_helper' -describe ProtectedBranches::CreateService do +RSpec.describe ProtectedBranches::CreateService do let(:project) { create(:project) } let(:user) { project.owner } let(:params) do diff --git a/spec/services/protected_branches/destroy_service_spec.rb b/spec/services/protected_branches/destroy_service_spec.rb index 3287eb9a59b..98d31147754 100644 --- a/spec/services/protected_branches/destroy_service_spec.rb +++ b/spec/services/protected_branches/destroy_service_spec.rb @@ -2,7 +2,7 @@ require 'spec_helper' -describe ProtectedBranches::DestroyService do +RSpec.describe ProtectedBranches::DestroyService do let(:protected_branch) { create(:protected_branch) } let(:project) { protected_branch.project } let(:user) { project.owner } diff --git a/spec/services/protected_branches/update_service_spec.rb b/spec/services/protected_branches/update_service_spec.rb index 7967ff81075..fdfbdf2e6ae 100644 --- a/spec/services/protected_branches/update_service_spec.rb +++ b/spec/services/protected_branches/update_service_spec.rb @@ -2,7 +2,7 @@ require 'spec_helper' -describe ProtectedBranches::UpdateService do +RSpec.describe ProtectedBranches::UpdateService do let(:protected_branch) { create(:protected_branch) } let(:project) { protected_branch.project } let(:user) { project.owner } diff --git a/spec/services/protected_tags/create_service_spec.rb b/spec/services/protected_tags/create_service_spec.rb index e58a539eb6f..e85a43eb51c 100644 --- a/spec/services/protected_tags/create_service_spec.rb +++ b/spec/services/protected_tags/create_service_spec.rb @@ -2,7 +2,7 @@ require 'spec_helper' -describe ProtectedTags::CreateService do +RSpec.describe ProtectedTags::CreateService do let(:project) { create(:project) } let(:user) { project.owner } let(:params) do diff --git a/spec/services/protected_tags/destroy_service_spec.rb b/spec/services/protected_tags/destroy_service_spec.rb index 52d1d1caa34..fbd1452a8d1 100644 --- a/spec/services/protected_tags/destroy_service_spec.rb +++ b/spec/services/protected_tags/destroy_service_spec.rb @@ -2,7 +2,7 @@ require 'spec_helper' -describe ProtectedTags::DestroyService do +RSpec.describe ProtectedTags::DestroyService do let(:protected_tag) { create(:protected_tag) } let(:project) { protected_tag.project } let(:user) { project.owner } diff --git a/spec/services/protected_tags/update_service_spec.rb b/spec/services/protected_tags/update_service_spec.rb index ca5109aca9c..ed151ca2347 100644 --- a/spec/services/protected_tags/update_service_spec.rb +++ b/spec/services/protected_tags/update_service_spec.rb @@ -2,7 +2,7 @@ require 'spec_helper' -describe ProtectedTags::UpdateService do +RSpec.describe ProtectedTags::UpdateService do let(:protected_tag) { create(:protected_tag) } let(:project) { protected_tag.project } let(:user) { project.owner } diff --git a/spec/services/push_event_payload_service_spec.rb b/spec/services/push_event_payload_service_spec.rb index 855b10c0259..de2bec21a3c 100644 --- a/spec/services/push_event_payload_service_spec.rb +++ b/spec/services/push_event_payload_service_spec.rb @@ -2,7 +2,7 @@ require 'spec_helper' -describe PushEventPayloadService do +RSpec.describe PushEventPayloadService do let(:event) { create(:push_event) } describe '#execute' do diff --git a/spec/services/quick_actions/interpret_service_spec.rb b/spec/services/quick_actions/interpret_service_spec.rb index 1bd402e38be..66601d26bd2 100644 --- a/spec/services/quick_actions/interpret_service_spec.rb +++ b/spec/services/quick_actions/interpret_service_spec.rb @@ -2,7 +2,7 @@ require 'spec_helper' -describe QuickActions::InterpretService do +RSpec.describe QuickActions::InterpretService do let(:project) { create(:project, :public) } let(:developer) { create(:user) } let(:developer2) { create(:user) } diff --git a/spec/services/quick_actions/target_service_spec.rb b/spec/services/quick_actions/target_service_spec.rb index 0aeb29cbeec..d960678f809 100644 --- a/spec/services/quick_actions/target_service_spec.rb +++ b/spec/services/quick_actions/target_service_spec.rb @@ -2,7 +2,7 @@ require 'spec_helper' -describe QuickActions::TargetService do +RSpec.describe QuickActions::TargetService do let(:project) { create(:project) } let(:user) { create(:user) } let(:service) { described_class.new(project, user) } diff --git a/spec/services/releases/create_evidence_service_spec.rb b/spec/services/releases/create_evidence_service_spec.rb index caa36a6b21d..818d20f0468 100644 --- a/spec/services/releases/create_evidence_service_spec.rb +++ b/spec/services/releases/create_evidence_service_spec.rb @@ -2,7 +2,7 @@ require 'spec_helper' -describe Releases::CreateEvidenceService do +RSpec.describe Releases::CreateEvidenceService do let_it_be(:project) { create(:project) } let(:release) { create(:release, project: project) } let(:service) { described_class.new(release) } diff --git a/spec/services/releases/create_service_spec.rb b/spec/services/releases/create_service_spec.rb index 4e3d9d5f108..3c0698aa203 100644 --- a/spec/services/releases/create_service_spec.rb +++ b/spec/services/releases/create_service_spec.rb @@ -2,7 +2,7 @@ require 'spec_helper' -describe Releases::CreateService do +RSpec.describe Releases::CreateService do let(:project) { create(:project, :repository) } let(:user) { create(:user) } let(:tag_name) { project.repository.tag_names.first } diff --git a/spec/services/releases/destroy_service_spec.rb b/spec/services/releases/destroy_service_spec.rb index 9d027767cd2..bc5bff0b31d 100644 --- a/spec/services/releases/destroy_service_spec.rb +++ b/spec/services/releases/destroy_service_spec.rb @@ -2,7 +2,7 @@ require 'spec_helper' -describe Releases::DestroyService do +RSpec.describe Releases::DestroyService do let(:project) { create(:project, :repository) } let(:mainatiner) { create(:user) } let(:repoter) { create(:user) } diff --git a/spec/services/releases/update_service_spec.rb b/spec/services/releases/update_service_spec.rb index 7f1849e39a4..00544b820cb 100644 --- a/spec/services/releases/update_service_spec.rb +++ b/spec/services/releases/update_service_spec.rb @@ -2,7 +2,7 @@ require 'spec_helper' -describe Releases::UpdateService do +RSpec.describe Releases::UpdateService do let(:project) { create(:project, :repository) } let(:user) { create(:user) } let(:new_name) { 'A new name' } diff --git a/spec/services/repositories/destroy_rollback_service_spec.rb b/spec/services/repositories/destroy_rollback_service_spec.rb index c3cdae17de7..9cc41a4c7f8 100644 --- a/spec/services/repositories/destroy_rollback_service_spec.rb +++ b/spec/services/repositories/destroy_rollback_service_spec.rb @@ -2,7 +2,7 @@ require 'spec_helper' -describe Repositories::DestroyRollbackService do +RSpec.describe Repositories::DestroyRollbackService do let_it_be(:user) { create(:user) } let!(:project) { create(:project, :repository, namespace: user.namespace) } let(:repository) { project.repository } diff --git a/spec/services/repositories/destroy_service_spec.rb b/spec/services/repositories/destroy_service_spec.rb index 9c2694483c1..794f3136929 100644 --- a/spec/services/repositories/destroy_service_spec.rb +++ b/spec/services/repositories/destroy_service_spec.rb @@ -2,7 +2,7 @@ require 'spec_helper' -describe Repositories::DestroyService do +RSpec.describe Repositories::DestroyService do let_it_be(:user) { create(:user) } let!(:project) { create(:project, :repository, namespace: user.namespace) } let(:repository) { project.repository } diff --git a/spec/services/repositories/shell_destroy_service_spec.rb b/spec/services/repositories/shell_destroy_service_spec.rb index 9419977f6fe..9020ef7b209 100644 --- a/spec/services/repositories/shell_destroy_service_spec.rb +++ b/spec/services/repositories/shell_destroy_service_spec.rb @@ -2,7 +2,7 @@ require 'spec_helper' -describe Repositories::ShellDestroyService do +RSpec.describe Repositories::ShellDestroyService do let_it_be(:user) { create(:user) } let!(:project) { create(:project, :repository, namespace: user.namespace) } let(:path) { project.repository.disk_path } diff --git a/spec/services/repository_archive_clean_up_service_spec.rb b/spec/services/repository_archive_clean_up_service_spec.rb index 80b177a0174..c6d673fb1b5 100644 --- a/spec/services/repository_archive_clean_up_service_spec.rb +++ b/spec/services/repository_archive_clean_up_service_spec.rb @@ -2,7 +2,7 @@ require 'spec_helper' -describe RepositoryArchiveCleanUpService do +RSpec.describe RepositoryArchiveCleanUpService do subject(:service) { described_class.new } describe '#execute (new archive locations)' do diff --git a/spec/services/reset_project_cache_service_spec.rb b/spec/services/reset_project_cache_service_spec.rb index a4db4481c36..3e79270da8d 100644 --- a/spec/services/reset_project_cache_service_spec.rb +++ b/spec/services/reset_project_cache_service_spec.rb @@ -2,7 +2,7 @@ require 'spec_helper' -describe ResetProjectCacheService do +RSpec.describe ResetProjectCacheService do let(:project) { create(:project) } let(:user) { create(:user) } diff --git a/spec/services/resource_access_tokens/create_service_spec.rb b/spec/services/resource_access_tokens/create_service_spec.rb index 57e7e4e66de..f1fabb005d0 100644 --- a/spec/services/resource_access_tokens/create_service_spec.rb +++ b/spec/services/resource_access_tokens/create_service_spec.rb @@ -2,7 +2,7 @@ require 'spec_helper' -describe ResourceAccessTokens::CreateService do +RSpec.describe ResourceAccessTokens::CreateService do subject { described_class.new(user, resource, params).execute } let_it_be(:user) { create(:user) } diff --git a/spec/services/resource_access_tokens/revoke_service_spec.rb b/spec/services/resource_access_tokens/revoke_service_spec.rb index 3ce82745b9e..ffc06d770f8 100644 --- a/spec/services/resource_access_tokens/revoke_service_spec.rb +++ b/spec/services/resource_access_tokens/revoke_service_spec.rb @@ -2,7 +2,7 @@ require 'spec_helper' -describe ResourceAccessTokens::RevokeService do +RSpec.describe ResourceAccessTokens::RevokeService do subject { described_class.new(user, resource, access_token).execute } let_it_be(:user) { create(:user) } diff --git a/spec/services/resource_events/change_labels_service_spec.rb b/spec/services/resource_events/change_labels_service_spec.rb index 2b987b7fec9..efee185669e 100644 --- a/spec/services/resource_events/change_labels_service_spec.rb +++ b/spec/services/resource_events/change_labels_service_spec.rb @@ -2,7 +2,7 @@ require 'spec_helper' -describe ResourceEvents::ChangeLabelsService do +RSpec.describe ResourceEvents::ChangeLabelsService do let_it_be(:project) { create(:project) } let_it_be(:author) { create(:user) } let(:resource) { create(:issue, project: project) } diff --git a/spec/services/resource_events/change_milestone_service_spec.rb b/spec/services/resource_events/change_milestone_service_spec.rb index dec01d0db8d..9c0f9420f7a 100644 --- a/spec/services/resource_events/change_milestone_service_spec.rb +++ b/spec/services/resource_events/change_milestone_service_spec.rb @@ -2,7 +2,7 @@ require 'spec_helper' -describe ResourceEvents::ChangeMilestoneService do +RSpec.describe ResourceEvents::ChangeMilestoneService do [:issue, :merge_request].each do |issuable| it_behaves_like 'a milestone events creator' do let(:resource) { create(issuable) } diff --git a/spec/services/resource_events/change_state_service_spec.rb b/spec/services/resource_events/change_state_service_spec.rb index e5d2a4ab11e..a2a2f119830 100644 --- a/spec/services/resource_events/change_state_service_spec.rb +++ b/spec/services/resource_events/change_state_service_spec.rb @@ -2,7 +2,7 @@ require 'spec_helper' -describe ResourceEvents::ChangeStateService do +RSpec.describe ResourceEvents::ChangeStateService do let_it_be(:project) { create(:project) } let_it_be(:user) { create(:user) } diff --git a/spec/services/resource_events/merge_into_notes_service_spec.rb b/spec/services/resource_events/merge_into_notes_service_spec.rb index 2664a27244d..f9ddf954cd5 100644 --- a/spec/services/resource_events/merge_into_notes_service_spec.rb +++ b/spec/services/resource_events/merge_into_notes_service_spec.rb @@ -2,7 +2,7 @@ require 'spec_helper' -describe ResourceEvents::MergeIntoNotesService do +RSpec.describe ResourceEvents::MergeIntoNotesService do def create_event(params) event_params = { action: :add, label: label, issue: resource, user: user } diff --git a/spec/services/resource_events/synthetic_label_notes_builder_service_spec.rb b/spec/services/resource_events/synthetic_label_notes_builder_service_spec.rb index 41902bc1da1..cb42ad5b617 100644 --- a/spec/services/resource_events/synthetic_label_notes_builder_service_spec.rb +++ b/spec/services/resource_events/synthetic_label_notes_builder_service_spec.rb @@ -2,7 +2,7 @@ require 'spec_helper' -describe ResourceEvents::SyntheticLabelNotesBuilderService do +RSpec.describe ResourceEvents::SyntheticLabelNotesBuilderService do describe '#execute' do let!(:user) { create(:user) } diff --git a/spec/services/resource_events/synthetic_milestone_notes_builder_service_spec.rb b/spec/services/resource_events/synthetic_milestone_notes_builder_service_spec.rb index e98b8bd00dc..5e3afeabee7 100644 --- a/spec/services/resource_events/synthetic_milestone_notes_builder_service_spec.rb +++ b/spec/services/resource_events/synthetic_milestone_notes_builder_service_spec.rb @@ -2,7 +2,7 @@ require 'spec_helper' -describe ResourceEvents::SyntheticMilestoneNotesBuilderService do +RSpec.describe ResourceEvents::SyntheticMilestoneNotesBuilderService do describe '#execute' do let_it_be(:user) { create(:user) } let_it_be(:issue) { create(:issue, author: user) } diff --git a/spec/services/search/global_service_spec.rb b/spec/services/search/global_service_spec.rb index 0f829df90b3..90ad18e5571 100644 --- a/spec/services/search/global_service_spec.rb +++ b/spec/services/search/global_service_spec.rb @@ -2,7 +2,7 @@ require 'spec_helper' -describe Search::GlobalService do +RSpec.describe Search::GlobalService do let(:user) { create(:user) } let(:internal_user) { create(:user) } diff --git a/spec/services/search/group_service_spec.rb b/spec/services/search/group_service_spec.rb index cfb672753b8..d3026d158d4 100644 --- a/spec/services/search/group_service_spec.rb +++ b/spec/services/search/group_service_spec.rb @@ -2,7 +2,7 @@ require 'spec_helper' -describe Search::GroupService do +RSpec.describe Search::GroupService do shared_examples_for 'group search' do context 'finding projects by name' do let(:user) { create(:user) } diff --git a/spec/services/search/snippet_service_spec.rb b/spec/services/search/snippet_service_spec.rb index cb2bb0c43fd..ceaf3d055bf 100644 --- a/spec/services/search/snippet_service_spec.rb +++ b/spec/services/search/snippet_service_spec.rb @@ -2,7 +2,7 @@ require 'spec_helper' -describe Search::SnippetService do +RSpec.describe Search::SnippetService do let_it_be(:author) { create(:author) } let_it_be(:project) { create(:project, :public) } diff --git a/spec/services/search_service_spec.rb b/spec/services/search_service_spec.rb index 0333eb85fb6..52aef73ac77 100644 --- a/spec/services/search_service_spec.rb +++ b/spec/services/search_service_spec.rb @@ -2,7 +2,7 @@ require 'spec_helper' -describe SearchService do +RSpec.describe SearchService do let_it_be(:user) { create(:user) } let_it_be(:accessible_group) { create(:group, :private) } diff --git a/spec/services/serverless/associate_domain_service_spec.rb b/spec/services/serverless/associate_domain_service_spec.rb index 3d1a878bcf5..3b5231989bc 100644 --- a/spec/services/serverless/associate_domain_service_spec.rb +++ b/spec/services/serverless/associate_domain_service_spec.rb @@ -2,7 +2,7 @@ require 'spec_helper' -describe Serverless::AssociateDomainService do +RSpec.describe Serverless::AssociateDomainService do subject { described_class.new(knative, pages_domain_id: pages_domain_id, creator: creator) } let(:sdc) { create(:serverless_domain_cluster, pages_domain: create(:pages_domain, :instance_serverless)) } diff --git a/spec/services/service_response_spec.rb b/spec/services/service_response_spec.rb index 2c944a63ebb..986b26e67d7 100644 --- a/spec/services/service_response_spec.rb +++ b/spec/services/service_response_spec.rb @@ -4,7 +4,7 @@ require 'fast_spec_helper' ActiveSupport::Dependencies.autoload_paths << 'app/services' -describe ServiceResponse do +RSpec.describe ServiceResponse do describe '.success' do it 'creates a successful response without a message' do expect(described_class.success).to be_success diff --git a/spec/services/snippets/bulk_destroy_service_spec.rb b/spec/services/snippets/bulk_destroy_service_spec.rb index 6e5623e575f..8a6250a8b45 100644 --- a/spec/services/snippets/bulk_destroy_service_spec.rb +++ b/spec/services/snippets/bulk_destroy_service_spec.rb @@ -2,7 +2,7 @@ require 'spec_helper' -describe Snippets::BulkDestroyService do +RSpec.describe Snippets::BulkDestroyService do let_it_be(:project) { create(:project) } let(:user) { create(:user) } let!(:personal_snippet) { create(:personal_snippet, :repository, author: user) } diff --git a/spec/services/snippets/count_service_spec.rb b/spec/services/snippets/count_service_spec.rb index 4137e65dcca..5ce637d0bac 100644 --- a/spec/services/snippets/count_service_spec.rb +++ b/spec/services/snippets/count_service_spec.rb @@ -2,7 +2,7 @@ require 'spec_helper' -describe Snippets::CountService do +RSpec.describe Snippets::CountService do let_it_be(:user) { create(:user) } let_it_be(:project) { create(:project, :public) } diff --git a/spec/services/snippets/create_service_spec.rb b/spec/services/snippets/create_service_spec.rb index c88dabde9c7..f8e69b4b4bb 100644 --- a/spec/services/snippets/create_service_spec.rb +++ b/spec/services/snippets/create_service_spec.rb @@ -2,7 +2,7 @@ require 'spec_helper' -describe Snippets::CreateService do +RSpec.describe Snippets::CreateService do describe '#execute' do let_it_be(:user) { create(:user) } let_it_be(:admin) { create(:user, :admin) } diff --git a/spec/services/snippets/destroy_service_spec.rb b/spec/services/snippets/destroy_service_spec.rb index 840dc11a740..12423ad2d73 100644 --- a/spec/services/snippets/destroy_service_spec.rb +++ b/spec/services/snippets/destroy_service_spec.rb @@ -2,7 +2,7 @@ require 'spec_helper' -describe Snippets::DestroyService do +RSpec.describe Snippets::DestroyService do let_it_be(:project) { create(:project) } let_it_be(:user) { create(:user) } let_it_be(:other_user) { create(:user) } diff --git a/spec/services/snippets/update_service_spec.rb b/spec/services/snippets/update_service_spec.rb index 0f10b037ccd..b16c4d64af3 100644 --- a/spec/services/snippets/update_service_spec.rb +++ b/spec/services/snippets/update_service_spec.rb @@ -2,7 +2,7 @@ require 'spec_helper' -describe Snippets::UpdateService do +RSpec.describe Snippets::UpdateService do describe '#execute' do let_it_be(:user) { create(:user) } let_it_be(:admin) { create :user, admin: true } diff --git a/spec/services/spam/akismet_service_spec.rb b/spec/services/spam/akismet_service_spec.rb index 413b43d0156..f75b0216b78 100644 --- a/spec/services/spam/akismet_service_spec.rb +++ b/spec/services/spam/akismet_service_spec.rb @@ -2,7 +2,7 @@ require 'spec_helper' -describe Spam::AkismetService do +RSpec.describe Spam::AkismetService do let(:fake_akismet_client) { double(:akismet_client) } let_it_be(:text) { "Would you like to buy some tinned meat product?" } diff --git a/spec/services/spam/ham_service_spec.rb b/spec/services/spam/ham_service_spec.rb index 9848f48def2..c947de6cf92 100644 --- a/spec/services/spam/ham_service_spec.rb +++ b/spec/services/spam/ham_service_spec.rb @@ -2,7 +2,7 @@ require 'spec_helper' -describe Spam::HamService do +RSpec.describe Spam::HamService do let_it_be(:user) { create(:user) } let!(:spam_log) { create(:spam_log, user: user, submitted_as_ham: false) } let(:fake_akismet_service) { double(:akismet_service) } diff --git a/spec/services/spam/mark_as_spam_service_spec.rb b/spec/services/spam/mark_as_spam_service_spec.rb index 9978005279a..308a66c3a48 100644 --- a/spec/services/spam/mark_as_spam_service_spec.rb +++ b/spec/services/spam/mark_as_spam_service_spec.rb @@ -2,7 +2,7 @@ require 'spec_helper' -describe Spam::MarkAsSpamService do +RSpec.describe Spam::MarkAsSpamService do let(:user_agent_detail) { build(:user_agent_detail) } let(:spammable) { build(:issue, user_agent_detail: user_agent_detail) } let(:fake_akismet_service) { double(:akismet_service, submit_spam: true) } diff --git a/spec/services/spam/spam_action_service_spec.rb b/spec/services/spam/spam_action_service_spec.rb index 7b6b65c82b1..abb8e49ec52 100644 --- a/spec/services/spam/spam_action_service_spec.rb +++ b/spec/services/spam/spam_action_service_spec.rb @@ -2,7 +2,7 @@ require 'spec_helper' -describe Spam::SpamActionService do +RSpec.describe Spam::SpamActionService do include_context 'includes Spam constants' let(:fake_ip) { '1.2.3.4' } diff --git a/spec/services/spam/spam_verdict_service_spec.rb b/spec/services/spam/spam_verdict_service_spec.rb index b9f9657f20f..188b052da4c 100644 --- a/spec/services/spam/spam_verdict_service_spec.rb +++ b/spec/services/spam/spam_verdict_service_spec.rb @@ -2,7 +2,7 @@ require 'spec_helper' -describe Spam::SpamVerdictService do +RSpec.describe Spam::SpamVerdictService do include_context 'includes Spam constants' let(:fake_ip) { '1.2.3.4' } diff --git a/spec/services/submit_usage_ping_service_spec.rb b/spec/services/submit_usage_ping_service_spec.rb index 981ea0dbec1..4885ef99c13 100644 --- a/spec/services/submit_usage_ping_service_spec.rb +++ b/spec/services/submit_usage_ping_service_spec.rb @@ -2,7 +2,7 @@ require 'spec_helper' -describe SubmitUsagePingService do +RSpec.describe SubmitUsagePingService do include StubRequests include UsageDataHelpers diff --git a/spec/services/submodules/update_service_spec.rb b/spec/services/submodules/update_service_spec.rb index 47b31d4bcbf..e7f92d5ba28 100644 --- a/spec/services/submodules/update_service_spec.rb +++ b/spec/services/submodules/update_service_spec.rb @@ -1,7 +1,7 @@ # frozen_string_literal: true require 'spec_helper' -describe Submodules::UpdateService do +RSpec.describe Submodules::UpdateService do let(:project) { create(:project, :repository) } let(:repository) { project.repository } let(:user) { create(:user, :commit_email) } diff --git a/spec/services/suggestions/apply_service_spec.rb b/spec/services/suggestions/apply_service_spec.rb index 678e2129181..aa9caf35987 100644 --- a/spec/services/suggestions/apply_service_spec.rb +++ b/spec/services/suggestions/apply_service_spec.rb @@ -2,7 +2,7 @@ require 'spec_helper' -describe Suggestions::ApplyService do +RSpec.describe Suggestions::ApplyService do include ProjectForksHelper def build_position(**optional_args) diff --git a/spec/services/suggestions/create_service_spec.rb b/spec/services/suggestions/create_service_spec.rb index d95f9e3349b..54e7c5cc127 100644 --- a/spec/services/suggestions/create_service_spec.rb +++ b/spec/services/suggestions/create_service_spec.rb @@ -2,7 +2,7 @@ require 'spec_helper' -describe Suggestions::CreateService do +RSpec.describe Suggestions::CreateService do let(:project_with_repo) { create(:project, :repository) } let(:merge_request) do create(:merge_request, source_project: project_with_repo, diff --git a/spec/services/suggestions/outdate_service_spec.rb b/spec/services/suggestions/outdate_service_spec.rb index bcc627013d8..e8891f88548 100644 --- a/spec/services/suggestions/outdate_service_spec.rb +++ b/spec/services/suggestions/outdate_service_spec.rb @@ -2,7 +2,7 @@ require 'spec_helper' -describe Suggestions::OutdateService do +RSpec.describe Suggestions::OutdateService do describe '#execute' do let(:merge_request) { create(:merge_request) } let(:project) { merge_request.target_project } diff --git a/spec/services/system_hooks_service_spec.rb b/spec/services/system_hooks_service_spec.rb index d72e5cc2b16..bdc40a92e91 100644 --- a/spec/services/system_hooks_service_spec.rb +++ b/spec/services/system_hooks_service_spec.rb @@ -2,7 +2,7 @@ require 'spec_helper' -describe SystemHooksService do +RSpec.describe SystemHooksService do let(:user) { create(:user) } let(:project) { create(:project) } let(:project_member) { create(:project_member) } diff --git a/spec/services/system_note_service_spec.rb b/spec/services/system_note_service_spec.rb index 66f9b5d092f..2a1cb3e0585 100644 --- a/spec/services/system_note_service_spec.rb +++ b/spec/services/system_note_service_spec.rb @@ -2,7 +2,7 @@ require 'spec_helper' -describe SystemNoteService do +RSpec.describe SystemNoteService do include Gitlab::Routing include RepoHelpers include AssetsHelpers diff --git a/spec/services/system_notes/base_service_spec.rb b/spec/services/system_notes/base_service_spec.rb index 96788b05829..efb165f8e4c 100644 --- a/spec/services/system_notes/base_service_spec.rb +++ b/spec/services/system_notes/base_service_spec.rb @@ -2,7 +2,7 @@ require 'spec_helper' -describe SystemNotes::BaseService do +RSpec.describe SystemNotes::BaseService do let(:noteable) { double } let(:project) { double } let(:author) { double } diff --git a/spec/services/system_notes/commit_service_spec.rb b/spec/services/system_notes/commit_service_spec.rb index 5839a17e4a0..bd6b3ec953a 100644 --- a/spec/services/system_notes/commit_service_spec.rb +++ b/spec/services/system_notes/commit_service_spec.rb @@ -2,7 +2,7 @@ require 'spec_helper' -describe SystemNotes::CommitService do +RSpec.describe SystemNotes::CommitService do let_it_be(:group) { create(:group) } let_it_be(:project) { create(:project, :repository, group: group) } let_it_be(:author) { create(:user) } diff --git a/spec/services/system_notes/design_management_service_spec.rb b/spec/services/system_notes/design_management_service_spec.rb index 08511e62341..6267ad2aaad 100644 --- a/spec/services/system_notes/design_management_service_spec.rb +++ b/spec/services/system_notes/design_management_service_spec.rb @@ -2,7 +2,7 @@ require 'spec_helper' -describe SystemNotes::DesignManagementService do +RSpec.describe SystemNotes::DesignManagementService do let(:project) { create(:project) } let(:issue) { create(:issue, project: project) } diff --git a/spec/services/system_notes/issuables_service_spec.rb b/spec/services/system_notes/issuables_service_spec.rb index c3b3c877583..ca8b8ce4dcf 100644 --- a/spec/services/system_notes/issuables_service_spec.rb +++ b/spec/services/system_notes/issuables_service_spec.rb @@ -2,7 +2,7 @@ require 'spec_helper' -describe ::SystemNotes::IssuablesService do +RSpec.describe ::SystemNotes::IssuablesService do include ProjectForksHelper let_it_be(:group) { create(:group) } diff --git a/spec/services/system_notes/merge_requests_service_spec.rb b/spec/services/system_notes/merge_requests_service_spec.rb index 13d6367a585..1c378123797 100644 --- a/spec/services/system_notes/merge_requests_service_spec.rb +++ b/spec/services/system_notes/merge_requests_service_spec.rb @@ -2,7 +2,7 @@ require 'spec_helper' -describe ::SystemNotes::MergeRequestsService do +RSpec.describe ::SystemNotes::MergeRequestsService do include Gitlab::Routing let_it_be(:group) { create(:group) } diff --git a/spec/services/system_notes/time_tracking_service_spec.rb b/spec/services/system_notes/time_tracking_service_spec.rb index 7e3e6a75cdf..f671e66cdcd 100644 --- a/spec/services/system_notes/time_tracking_service_spec.rb +++ b/spec/services/system_notes/time_tracking_service_spec.rb @@ -2,7 +2,7 @@ require 'spec_helper' -describe ::SystemNotes::TimeTrackingService do +RSpec.describe ::SystemNotes::TimeTrackingService do let_it_be(:author) { create(:user) } let_it_be(:project) { create(:project, :repository) } diff --git a/spec/services/system_notes/zoom_service_spec.rb b/spec/services/system_notes/zoom_service_spec.rb index 435cdb5748e..986324c9664 100644 --- a/spec/services/system_notes/zoom_service_spec.rb +++ b/spec/services/system_notes/zoom_service_spec.rb @@ -2,7 +2,7 @@ require 'spec_helper' -describe ::SystemNotes::ZoomService do +RSpec.describe ::SystemNotes::ZoomService do let_it_be(:project) { create(:project, :repository) } let_it_be(:author) { create(:user) } diff --git a/spec/services/tags/create_service_spec.rb b/spec/services/tags/create_service_spec.rb index e505960d3c7..b1c6623308e 100644 --- a/spec/services/tags/create_service_spec.rb +++ b/spec/services/tags/create_service_spec.rb @@ -2,7 +2,7 @@ require 'spec_helper' -describe Tags::CreateService do +RSpec.describe Tags::CreateService do let(:project) { create(:project, :repository) } let(:repository) { project.repository } let(:user) { create(:user) } diff --git a/spec/services/tags/destroy_service_spec.rb b/spec/services/tags/destroy_service_spec.rb index b46bd77eafe..3551ce38268 100644 --- a/spec/services/tags/destroy_service_spec.rb +++ b/spec/services/tags/destroy_service_spec.rb @@ -2,7 +2,7 @@ require 'spec_helper' -describe Tags::DestroyService do +RSpec.describe Tags::DestroyService do let(:project) { create(:project, :repository) } let(:repository) { project.repository } let(:user) { create(:user) } diff --git a/spec/services/task_list_toggle_service_spec.rb b/spec/services/task_list_toggle_service_spec.rb index 82a5446dcb8..276f2ae435e 100644 --- a/spec/services/task_list_toggle_service_spec.rb +++ b/spec/services/task_list_toggle_service_spec.rb @@ -2,7 +2,7 @@ require 'spec_helper' -describe TaskListToggleService do +RSpec.describe TaskListToggleService do let(:markdown) do <<-EOT.strip_heredoc * [ ] Task 1 diff --git a/spec/services/terraform/remote_state_handler_spec.rb b/spec/services/terraform/remote_state_handler_spec.rb index f4e1831b2e8..d3a84155e19 100644 --- a/spec/services/terraform/remote_state_handler_spec.rb +++ b/spec/services/terraform/remote_state_handler_spec.rb @@ -2,7 +2,7 @@ require 'spec_helper' -describe Terraform::RemoteStateHandler do +RSpec.describe Terraform::RemoteStateHandler do let_it_be(:project) { create(:project) } let_it_be(:user) { create(:user) } diff --git a/spec/services/test_hooks/project_service_spec.rb b/spec/services/test_hooks/project_service_spec.rb index 3c5bc0d85f2..e4cc3a2d652 100644 --- a/spec/services/test_hooks/project_service_spec.rb +++ b/spec/services/test_hooks/project_service_spec.rb @@ -2,7 +2,7 @@ require 'spec_helper' -describe TestHooks::ProjectService do +RSpec.describe TestHooks::ProjectService do let(:current_user) { create(:user) } describe '#execute' do diff --git a/spec/services/test_hooks/system_service_spec.rb b/spec/services/test_hooks/system_service_spec.rb index 8a86b14a2a1..34dd2173b09 100644 --- a/spec/services/test_hooks/system_service_spec.rb +++ b/spec/services/test_hooks/system_service_spec.rb @@ -2,7 +2,7 @@ require 'spec_helper' -describe TestHooks::SystemService do +RSpec.describe TestHooks::SystemService do let(:current_user) { create(:user) } describe '#execute' do diff --git a/spec/services/todo_service_spec.rb b/spec/services/todo_service_spec.rb index f6e1608acbe..b187025eb11 100644 --- a/spec/services/todo_service_spec.rb +++ b/spec/services/todo_service_spec.rb @@ -2,7 +2,7 @@ require 'spec_helper' -describe TodoService do +RSpec.describe TodoService do let(:author) { create(:user) } let(:assignee) { create(:user) } let(:non_member) { create(:user) } diff --git a/spec/services/todos/destroy/confidential_issue_service_spec.rb b/spec/services/todos/destroy/confidential_issue_service_spec.rb index 9f7e656f7d3..ddce45e7968 100644 --- a/spec/services/todos/destroy/confidential_issue_service_spec.rb +++ b/spec/services/todos/destroy/confidential_issue_service_spec.rb @@ -2,7 +2,7 @@ require 'spec_helper' -describe Todos::Destroy::ConfidentialIssueService do +RSpec.describe Todos::Destroy::ConfidentialIssueService do let(:project) { create(:project, :public) } let(:user) { create(:user) } let(:author) { create(:user) } diff --git a/spec/services/todos/destroy/entity_leave_service_spec.rb b/spec/services/todos/destroy/entity_leave_service_spec.rb index 45e3bf381fb..ccafe3bb7a8 100644 --- a/spec/services/todos/destroy/entity_leave_service_spec.rb +++ b/spec/services/todos/destroy/entity_leave_service_spec.rb @@ -2,7 +2,7 @@ require 'spec_helper' -describe Todos::Destroy::EntityLeaveService do +RSpec.describe Todos::Destroy::EntityLeaveService do let(:group) { create(:group, :private) } let(:project) { create(:project, group: group) } let(:user) { create(:user) } diff --git a/spec/services/todos/destroy/group_private_service_spec.rb b/spec/services/todos/destroy/group_private_service_spec.rb index 7dd495847b3..30d02cb7400 100644 --- a/spec/services/todos/destroy/group_private_service_spec.rb +++ b/spec/services/todos/destroy/group_private_service_spec.rb @@ -2,7 +2,7 @@ require 'spec_helper' -describe Todos::Destroy::GroupPrivateService do +RSpec.describe Todos::Destroy::GroupPrivateService do let(:group) { create(:group, :public) } let(:project) { create(:project, group: group) } let(:user) { create(:user) } diff --git a/spec/services/todos/destroy/private_features_service_spec.rb b/spec/services/todos/destroy/private_features_service_spec.rb index dfe9f42e8b1..6dbd7574b80 100644 --- a/spec/services/todos/destroy/private_features_service_spec.rb +++ b/spec/services/todos/destroy/private_features_service_spec.rb @@ -2,7 +2,7 @@ require 'spec_helper' -describe Todos::Destroy::PrivateFeaturesService do +RSpec.describe Todos::Destroy::PrivateFeaturesService do let(:project) { create(:project, :public) } let(:user) { create(:user) } let(:another_user) { create(:user) } diff --git a/spec/services/todos/destroy/project_private_service_spec.rb b/spec/services/todos/destroy/project_private_service_spec.rb index 7c0c76b6c29..1d1c010535d 100644 --- a/spec/services/todos/destroy/project_private_service_spec.rb +++ b/spec/services/todos/destroy/project_private_service_spec.rb @@ -2,7 +2,7 @@ require 'spec_helper' -describe Todos::Destroy::ProjectPrivateService do +RSpec.describe Todos::Destroy::ProjectPrivateService do let(:group) { create(:group, :public) } let(:project) { create(:project, :public, group: group) } let(:user) { create(:user) } diff --git a/spec/services/update_merge_request_metrics_service_spec.rb b/spec/services/update_merge_request_metrics_service_spec.rb index 1aaf5e712f9..a07fcee91e4 100644 --- a/spec/services/update_merge_request_metrics_service_spec.rb +++ b/spec/services/update_merge_request_metrics_service_spec.rb @@ -2,7 +2,7 @@ require 'spec_helper' -describe MergeRequestMetricsService do +RSpec.describe MergeRequestMetricsService do let(:metrics) { create(:merge_request).metrics } describe '#merge' do diff --git a/spec/services/upload_service_spec.rb b/spec/services/upload_service_spec.rb index 504e61f9903..89a28e6a098 100644 --- a/spec/services/upload_service_spec.rb +++ b/spec/services/upload_service_spec.rb @@ -2,7 +2,7 @@ require 'spec_helper' -describe UploadService do +RSpec.describe UploadService do describe 'File service' do before do @user = create(:user) diff --git a/spec/services/user_project_access_changed_service_spec.rb b/spec/services/user_project_access_changed_service_spec.rb index e5ecdd123f7..070782992e7 100644 --- a/spec/services/user_project_access_changed_service_spec.rb +++ b/spec/services/user_project_access_changed_service_spec.rb @@ -2,7 +2,7 @@ require 'spec_helper' -describe UserProjectAccessChangedService do +RSpec.describe UserProjectAccessChangedService do describe '#execute' do it 'schedules the user IDs' do expect(AuthorizedProjectsWorker).to receive(:bulk_perform_and_wait) diff --git a/spec/services/users/activity_service_spec.rb b/spec/services/users/activity_service_spec.rb index 5f068a2033c..4bbf6a2bcb8 100644 --- a/spec/services/users/activity_service_spec.rb +++ b/spec/services/users/activity_service_spec.rb @@ -2,7 +2,7 @@ require 'spec_helper' -describe Users::ActivityService do +RSpec.describe Users::ActivityService do include ExclusiveLeaseHelpers let(:user) { create(:user, last_activity_on: last_activity_on) } diff --git a/spec/services/users/block_service_spec.rb b/spec/services/users/block_service_spec.rb index c3a65a08c0d..e170a5494aa 100644 --- a/spec/services/users/block_service_spec.rb +++ b/spec/services/users/block_service_spec.rb @@ -2,7 +2,7 @@ require 'spec_helper' -describe Users::BlockService do +RSpec.describe Users::BlockService do let(:current_user) { create(:admin) } subject(:service) { described_class.new(current_user) } diff --git a/spec/services/users/build_service_spec.rb b/spec/services/users/build_service_spec.rb index 7588be833ae..c14fdb35bfa 100644 --- a/spec/services/users/build_service_spec.rb +++ b/spec/services/users/build_service_spec.rb @@ -2,7 +2,7 @@ require 'spec_helper' -describe Users::BuildService do +RSpec.describe Users::BuildService do describe '#execute' do let(:params) do { name: 'John Doe', username: 'jduser', email: 'jd@example.com', password: 'mydummypass' } diff --git a/spec/services/users/create_service_spec.rb b/spec/services/users/create_service_spec.rb index c783a1403df..69d2d6ca9ff 100644 --- a/spec/services/users/create_service_spec.rb +++ b/spec/services/users/create_service_spec.rb @@ -2,7 +2,7 @@ require 'spec_helper' -describe Users::CreateService do +RSpec.describe Users::CreateService do describe '#execute' do let(:admin_user) { create(:admin) } diff --git a/spec/services/users/destroy_service_spec.rb b/spec/services/users/destroy_service_spec.rb index 3db5e66fe05..ff919257b3c 100644 --- a/spec/services/users/destroy_service_spec.rb +++ b/spec/services/users/destroy_service_spec.rb @@ -2,7 +2,7 @@ require 'spec_helper' -describe Users::DestroyService do +RSpec.describe Users::DestroyService do describe "Deletes a user and all their personal projects" do let!(:user) { create(:user) } let!(:admin) { create(:admin) } diff --git a/spec/services/users/keys_count_service_spec.rb b/spec/services/users/keys_count_service_spec.rb index 83af051e728..aff267cce5e 100644 --- a/spec/services/users/keys_count_service_spec.rb +++ b/spec/services/users/keys_count_service_spec.rb @@ -2,7 +2,7 @@ require 'spec_helper' -describe Users::KeysCountService, :use_clean_rails_memory_store_caching do +RSpec.describe Users::KeysCountService, :use_clean_rails_memory_store_caching do let(:user) { create(:user) } subject { described_class.new(user) } diff --git a/spec/services/users/last_push_event_service_spec.rb b/spec/services/users/last_push_event_service_spec.rb index 424e9e2f8ef..5b755db407f 100644 --- a/spec/services/users/last_push_event_service_spec.rb +++ b/spec/services/users/last_push_event_service_spec.rb @@ -2,7 +2,7 @@ require 'spec_helper' -describe Users::LastPushEventService do +RSpec.describe Users::LastPushEventService do let(:user) { build(:user, id: 1) } let(:project) { build(:project, id: 2) } let(:event) { build(:push_event, id: 3, author: user, project: project) } diff --git a/spec/services/users/migrate_to_ghost_user_service_spec.rb b/spec/services/users/migrate_to_ghost_user_service_spec.rb index c2a793b2368..c9c8f9a74d3 100644 --- a/spec/services/users/migrate_to_ghost_user_service_spec.rb +++ b/spec/services/users/migrate_to_ghost_user_service_spec.rb @@ -2,7 +2,7 @@ require 'spec_helper' -describe Users::MigrateToGhostUserService do +RSpec.describe Users::MigrateToGhostUserService do let!(:user) { create(:user) } let!(:project) { create(:project, :repository) } let(:service) { described_class.new(user) } diff --git a/spec/services/users/refresh_authorized_projects_service_spec.rb b/spec/services/users/refresh_authorized_projects_service_spec.rb index d7ba7f5f69e..e45cb05a6c5 100644 --- a/spec/services/users/refresh_authorized_projects_service_spec.rb +++ b/spec/services/users/refresh_authorized_projects_service_spec.rb @@ -2,7 +2,7 @@ require 'spec_helper' -describe Users::RefreshAuthorizedProjectsService do +RSpec.describe Users::RefreshAuthorizedProjectsService do include ExclusiveLeaseHelpers # We're using let! here so that any expectations for the service class are not diff --git a/spec/services/users/repair_ldap_blocked_service_spec.rb b/spec/services/users/repair_ldap_blocked_service_spec.rb index bf80cc79d62..b33dcb92f45 100644 --- a/spec/services/users/repair_ldap_blocked_service_spec.rb +++ b/spec/services/users/repair_ldap_blocked_service_spec.rb @@ -2,7 +2,7 @@ require 'spec_helper' -describe Users::RepairLdapBlockedService do +RSpec.describe Users::RepairLdapBlockedService do let(:user) { create(:omniauth_user, provider: 'ldapmain', state: 'ldap_blocked') } let(:identity) { user.ldap_identity } diff --git a/spec/services/users/respond_to_terms_service_spec.rb b/spec/services/users/respond_to_terms_service_spec.rb index d840706e8a5..1997dcd0e04 100644 --- a/spec/services/users/respond_to_terms_service_spec.rb +++ b/spec/services/users/respond_to_terms_service_spec.rb @@ -2,7 +2,7 @@ require 'spec_helper' -describe Users::RespondToTermsService do +RSpec.describe Users::RespondToTermsService do let(:user) { create(:user) } let(:term) { create(:term) } diff --git a/spec/services/users/set_status_service_spec.rb b/spec/services/users/set_status_service_spec.rb index 554f5e9dc5e..54489adceb0 100644 --- a/spec/services/users/set_status_service_spec.rb +++ b/spec/services/users/set_status_service_spec.rb @@ -2,7 +2,7 @@ require 'spec_helper' -describe Users::SetStatusService do +RSpec.describe Users::SetStatusService do let(:current_user) { create(:user) } subject(:service) { described_class.new(current_user, params) } diff --git a/spec/services/users/signup_service_spec.rb b/spec/services/users/signup_service_spec.rb index 7d3cd614142..cc234309817 100644 --- a/spec/services/users/signup_service_spec.rb +++ b/spec/services/users/signup_service_spec.rb @@ -2,7 +2,7 @@ require 'spec_helper' -describe Users::SignupService do +RSpec.describe Users::SignupService do let(:user) { create(:user, setup_for_company: true) } describe '#execute' do diff --git a/spec/services/users/update_canonical_email_service_spec.rb b/spec/services/users/update_canonical_email_service_spec.rb index 68ba1b75b6c..1dead13d338 100644 --- a/spec/services/users/update_canonical_email_service_spec.rb +++ b/spec/services/users/update_canonical_email_service_spec.rb @@ -2,7 +2,7 @@ require 'spec_helper' -describe Users::UpdateCanonicalEmailService do +RSpec.describe Users::UpdateCanonicalEmailService do let(:other_email) { "differentaddress@includeddomain.com" } before do diff --git a/spec/services/users/update_highest_member_role_service_spec.rb b/spec/services/users/update_highest_member_role_service_spec.rb index 8063abffc2a..89ddd635bb6 100644 --- a/spec/services/users/update_highest_member_role_service_spec.rb +++ b/spec/services/users/update_highest_member_role_service_spec.rb @@ -2,7 +2,7 @@ require 'spec_helper' -describe Users::UpdateHighestMemberRoleService do +RSpec.describe Users::UpdateHighestMemberRoleService do let(:user) { create(:user) } let(:execute_service) { described_class.new(user).execute } diff --git a/spec/services/users/update_service_spec.rb b/spec/services/users/update_service_spec.rb index 8e13e7d9c0c..274c44394f3 100644 --- a/spec/services/users/update_service_spec.rb +++ b/spec/services/users/update_service_spec.rb @@ -2,7 +2,7 @@ require 'spec_helper' -describe Users::UpdateService do +RSpec.describe Users::UpdateService do let(:user) { create(:user) } describe '#execute' do diff --git a/spec/services/verify_pages_domain_service_spec.rb b/spec/services/verify_pages_domain_service_spec.rb index 3f08ae84c14..29ad85a16ce 100644 --- a/spec/services/verify_pages_domain_service_spec.rb +++ b/spec/services/verify_pages_domain_service_spec.rb @@ -2,7 +2,7 @@ require 'spec_helper' -describe VerifyPagesDomainService do +RSpec.describe VerifyPagesDomainService do using RSpec::Parameterized::TableSyntax include EmailHelpers diff --git a/spec/services/web_hook_service_spec.rb b/spec/services/web_hook_service_spec.rb index 4a917ecdbb5..2be481c5b62 100644 --- a/spec/services/web_hook_service_spec.rb +++ b/spec/services/web_hook_service_spec.rb @@ -2,7 +2,7 @@ require 'spec_helper' -describe WebHookService do +RSpec.describe WebHookService do include StubRequests let(:project) { create(:project) } diff --git a/spec/services/wiki_pages/base_service_spec.rb b/spec/services/wiki_pages/base_service_spec.rb index fede86a5192..6ccc796014c 100644 --- a/spec/services/wiki_pages/base_service_spec.rb +++ b/spec/services/wiki_pages/base_service_spec.rb @@ -2,7 +2,7 @@ require 'spec_helper' -describe WikiPages::BaseService do +RSpec.describe WikiPages::BaseService do let(:project) { double('project') } let(:user) { double('user') } diff --git a/spec/services/wiki_pages/create_service_spec.rb b/spec/services/wiki_pages/create_service_spec.rb index 2a17805110e..44b57088319 100644 --- a/spec/services/wiki_pages/create_service_spec.rb +++ b/spec/services/wiki_pages/create_service_spec.rb @@ -2,6 +2,6 @@ require 'spec_helper' -describe WikiPages::CreateService do +RSpec.describe WikiPages::CreateService do it_behaves_like 'WikiPages::CreateService#execute', :project end diff --git a/spec/services/wiki_pages/destroy_service_spec.rb b/spec/services/wiki_pages/destroy_service_spec.rb index b6fee1fd896..9384ea1cd43 100644 --- a/spec/services/wiki_pages/destroy_service_spec.rb +++ b/spec/services/wiki_pages/destroy_service_spec.rb @@ -2,6 +2,6 @@ require 'spec_helper' -describe WikiPages::DestroyService do +RSpec.describe WikiPages::DestroyService do it_behaves_like 'WikiPages::DestroyService#execute', :project end diff --git a/spec/services/wiki_pages/event_create_service_spec.rb b/spec/services/wiki_pages/event_create_service_spec.rb index c725c67d7a7..ddaf36d108a 100644 --- a/spec/services/wiki_pages/event_create_service_spec.rb +++ b/spec/services/wiki_pages/event_create_service_spec.rb @@ -2,7 +2,7 @@ require 'spec_helper' -describe WikiPages::EventCreateService do +RSpec.describe WikiPages::EventCreateService do let_it_be(:project) { create(:project) } let_it_be(:user) { create(:user) } diff --git a/spec/services/wiki_pages/update_service_spec.rb b/spec/services/wiki_pages/update_service_spec.rb index ac629a96f9a..33ac98e764d 100644 --- a/spec/services/wiki_pages/update_service_spec.rb +++ b/spec/services/wiki_pages/update_service_spec.rb @@ -2,6 +2,6 @@ require 'spec_helper' -describe WikiPages::UpdateService do +RSpec.describe WikiPages::UpdateService do it_behaves_like 'WikiPages::UpdateService#execute', :project end diff --git a/spec/services/wikis/create_attachment_service_spec.rb b/spec/services/wikis/create_attachment_service_spec.rb index 4adfaa24874..50cb9ac111c 100644 --- a/spec/services/wikis/create_attachment_service_spec.rb +++ b/spec/services/wikis/create_attachment_service_spec.rb @@ -1,7 +1,7 @@ # frozen_string_literal: true require 'spec_helper' -describe Wikis::CreateAttachmentService do +RSpec.describe Wikis::CreateAttachmentService do let(:container) { create(:project, :wiki_repo) } let(:user) { create(:user) } let(:file_name) { 'filename.txt' } diff --git a/spec/services/x509_certificate_revoke_service_spec.rb b/spec/services/x509_certificate_revoke_service_spec.rb index c2b2576904c..adad3281c13 100644 --- a/spec/services/x509_certificate_revoke_service_spec.rb +++ b/spec/services/x509_certificate_revoke_service_spec.rb @@ -2,7 +2,7 @@ require 'spec_helper' -describe X509CertificateRevokeService do +RSpec.describe X509CertificateRevokeService do describe '#execute' do let(:service) { described_class.new } let!(:x509_signature_1) { create(:x509_commit_signature, x509_certificate: x509_certificate, verification_status: :verified ) } diff --git a/spec/sidekiq/cron/job_gem_dependency_spec.rb b/spec/sidekiq/cron/job_gem_dependency_spec.rb index 20347b4d306..2924c86c8d0 100644 --- a/spec/sidekiq/cron/job_gem_dependency_spec.rb +++ b/spec/sidekiq/cron/job_gem_dependency_spec.rb @@ -2,7 +2,7 @@ require 'spec_helper' -describe Sidekiq::Cron::Job do +RSpec.describe Sidekiq::Cron::Job do describe 'cron jobs' do context 'when Fugit depends on ZoTime or EoTime' do before do diff --git a/spec/support/controllers/project_import_rate_limiter_shared_examples.rb b/spec/support/controllers/project_import_rate_limiter_shared_examples.rb index 9a543dd00d4..66d753a4010 100644 --- a/spec/support/controllers/project_import_rate_limiter_shared_examples.rb +++ b/spec/support/controllers/project_import_rate_limiter_shared_examples.rb @@ -1,6 +1,6 @@ # frozen_string_literal: true -shared_examples 'project import rate limiter' do +RSpec.shared_examples 'project import rate limiter' do let(:user) { create(:user) } before do diff --git a/spec/support/helpers/reference_parser_helpers.rb b/spec/support/helpers/reference_parser_helpers.rb index 9084265b587..e65cb8c96db 100644 --- a/spec/support/helpers/reference_parser_helpers.rb +++ b/spec/support/helpers/reference_parser_helpers.rb @@ -10,7 +10,7 @@ module ReferenceParserHelpers expect(result[:not_visible].count).to eq(not_visible_count) end - shared_examples 'no project N+1 queries' do + RSpec.shared_examples 'no project N+1 queries' do it 'avoids N+1 queries in #nodes_visible_to_user', :request_store do context = Banzai::RenderContext.new(project, user) @@ -28,7 +28,7 @@ module ReferenceParserHelpers end end - shared_examples 'no N+1 queries' do + RSpec.shared_examples 'no N+1 queries' do it_behaves_like 'no project N+1 queries' it 'avoids N+1 queries in #records_for_nodes', :request_store do diff --git a/spec/support/shared_contexts/cache_allowed_users_in_namespace_shared_context.rb b/spec/support/shared_contexts/cache_allowed_users_in_namespace_shared_context.rb index 04f49e94647..e3c1d0afa53 100644 --- a/spec/support/shared_contexts/cache_allowed_users_in_namespace_shared_context.rb +++ b/spec/support/shared_contexts/cache_allowed_users_in_namespace_shared_context.rb @@ -1,6 +1,6 @@ # frozen_string_literal: true -shared_examples 'allowed user IDs are cached' do +RSpec.shared_examples 'allowed user IDs are cached' do it 'caches the allowed user IDs in cache', :use_clean_rails_memory_store_caching do expect do expect(described_class.l1_cache_backend).to receive(:fetch).and_call_original diff --git a/spec/support/shared_contexts/design_management_shared_contexts.rb b/spec/support/shared_contexts/design_management_shared_contexts.rb index 2866effb3a8..3ff6a521338 100644 --- a/spec/support/shared_contexts/design_management_shared_contexts.rb +++ b/spec/support/shared_contexts/design_management_shared_contexts.rb @@ -1,6 +1,6 @@ # frozen_string_literal: true -shared_context 'four designs in three versions' do +RSpec.shared_context 'four designs in three versions' do include DesignManagementTestHelpers let_it_be(:issue) { create(:issue) } diff --git a/spec/support/shared_contexts/features/error_tracking_shared_context.rb b/spec/support/shared_contexts/features/error_tracking_shared_context.rb index 102cf7c9b11..1f4eb3a6df9 100644 --- a/spec/support/shared_contexts/features/error_tracking_shared_context.rb +++ b/spec/support/shared_contexts/features/error_tracking_shared_context.rb @@ -1,6 +1,6 @@ # frozen_string_literal: true -shared_context 'sentry error tracking context feature' do +RSpec.shared_context 'sentry error tracking context feature' do include ReactiveCachingHelpers let_it_be(:project) { create(:project) } diff --git a/spec/support/shared_contexts/issuable/merge_request_shared_context.rb b/spec/support/shared_contexts/issuable/merge_request_shared_context.rb index 05ffb934c34..79fc42e73c7 100644 --- a/spec/support/shared_contexts/issuable/merge_request_shared_context.rb +++ b/spec/support/shared_contexts/issuable/merge_request_shared_context.rb @@ -1,6 +1,6 @@ # frozen_string_literal: true -shared_context 'merge request show action' do +RSpec.shared_context 'merge request show action' do include Devise::Test::ControllerHelpers include ProjectForksHelper diff --git a/spec/support/shared_contexts/issuable/project_shared_context.rb b/spec/support/shared_contexts/issuable/project_shared_context.rb index 6dbf3154977..5e5f6f2b7a6 100644 --- a/spec/support/shared_contexts/issuable/project_shared_context.rb +++ b/spec/support/shared_contexts/issuable/project_shared_context.rb @@ -1,6 +1,6 @@ # frozen_string_literal: true -shared_context 'project show action' do +RSpec.shared_context 'project show action' do let(:project) { create(:project, :repository) } let(:issue) { create(:issue, project: project, author: user) } let(:user) { create(:user) } diff --git a/spec/support/shared_contexts/project_service_shared_context.rb b/spec/support/shared_contexts/project_service_shared_context.rb index 5b0dd26bd7b..a72d4901b72 100644 --- a/spec/support/shared_contexts/project_service_shared_context.rb +++ b/spec/support/shared_contexts/project_service_shared_context.rb @@ -1,6 +1,6 @@ # frozen_string_literal: true -shared_context 'project service activation' do +RSpec.shared_context 'project service activation' do let(:project) { create(:project) } let(:user) { create(:user) } diff --git a/spec/support/shared_contexts/requests/api/graphql/jira_import/jira_projects_context.rb b/spec/support/shared_contexts/requests/api/graphql/jira_import/jira_projects_context.rb index 3125f8ba315..7f150bed43d 100644 --- a/spec/support/shared_contexts/requests/api/graphql/jira_import/jira_projects_context.rb +++ b/spec/support/shared_contexts/requests/api/graphql/jira_import/jira_projects_context.rb @@ -1,6 +1,6 @@ # frozen_string_literal: true -shared_context 'jira projects request context' do +RSpec.shared_context 'jira projects request context' do let(:url) { 'https://jira.example.com' } let(:username) { 'jira-username' } let(:password) { 'jira-password' } diff --git a/spec/support/shared_contexts/sentry_error_tracking_shared_context.rb b/spec/support/shared_contexts/sentry_error_tracking_shared_context.rb index f06de53f0c1..3453f954c9d 100644 --- a/spec/support/shared_contexts/sentry_error_tracking_shared_context.rb +++ b/spec/support/shared_contexts/sentry_error_tracking_shared_context.rb @@ -1,6 +1,6 @@ # frozen_string_literal: true -shared_context 'sentry error tracking context' do +RSpec.shared_context 'sentry error tracking context' do let_it_be(:user) { create(:user) } let_it_be(:project) { create(:project) } diff --git a/spec/support/shared_contexts/spam_constants.rb b/spec/support/shared_contexts/spam_constants.rb index 32371f4b92f..813f9d00123 100644 --- a/spec/support/shared_contexts/spam_constants.rb +++ b/spec/support/shared_contexts/spam_constants.rb @@ -1,6 +1,6 @@ # frozen_string_literal: true -shared_context 'includes Spam constants' do +RSpec.shared_context 'includes Spam constants' do before do stub_const('CONDITIONAL_ALLOW', Spam::SpamConstants::CONDITIONAL_ALLOW) stub_const('DISALLOW', Spam::SpamConstants::DISALLOW) diff --git a/spec/support/shared_examples/features/error_tracking_shared_example.rb b/spec/support/shared_examples/features/error_tracking_shared_example.rb index 1cd05b22ae9..ae7d62f31a2 100644 --- a/spec/support/shared_examples/features/error_tracking_shared_example.rb +++ b/spec/support/shared_examples/features/error_tracking_shared_example.rb @@ -1,6 +1,6 @@ # frozen_string_literal: true -shared_examples 'error tracking index page' do +RSpec.shared_examples 'error tracking index page' do it 'renders the error index page', quarantine: { issue: 'https://gitlab.com/gitlab-org/gitlab/-/issues/217810' } do within('div.js-title-container') do expect(page).to have_content(project.namespace.name) @@ -33,7 +33,7 @@ shared_examples 'error tracking index page' do end end -shared_examples 'expanded stack trace context' do |selected_line: nil, expected_line: 1| +RSpec.shared_examples 'expanded stack trace context' do |selected_line: nil, expected_line: 1| it 'expands the stack trace context', quarantine: { issue: 'https://gitlab.com/gitlab-org/gitlab/-/issues/217810' } do within('div.stacktrace') do find("div.file-holder:nth-child(#{selected_line}) svg.ic-chevron-right").click if selected_line @@ -48,7 +48,7 @@ shared_examples 'expanded stack trace context' do |selected_line: nil, expected_ end end -shared_examples 'error tracking show page' do +RSpec.shared_examples 'error tracking show page' do it 'renders the error details', quarantine: { issue: 'https://gitlab.com/gitlab-org/gitlab/-/issues/217810' } do content = page.find(".content") nav = page.find("nav.breadcrumbs") diff --git a/spec/support/shared_examples/graphql/jira_import/jira_import_resolver_shared_examples.rb b/spec/support/shared_examples/graphql/jira_import/jira_import_resolver_shared_examples.rb index 2b96010477c..b2047f1d32c 100644 --- a/spec/support/shared_examples/graphql/jira_import/jira_import_resolver_shared_examples.rb +++ b/spec/support/shared_examples/graphql/jira_import/jira_import_resolver_shared_examples.rb @@ -1,12 +1,12 @@ # frozen_string_literal: true -shared_examples 'no Jira import data present' do +RSpec.shared_examples 'no Jira import data present' do it 'returns none' do expect(resolve_imports).to eq JiraImportState.none end end -shared_examples 'no Jira import access' do +RSpec.shared_examples 'no Jira import access' do it 'raises error' do expect do resolve_imports diff --git a/spec/support/shared_examples/graphql/projects/services_resolver_shared_examples.rb b/spec/support/shared_examples/graphql/projects/services_resolver_shared_examples.rb index 4bed322564a..94b7ed1618d 100644 --- a/spec/support/shared_examples/graphql/projects/services_resolver_shared_examples.rb +++ b/spec/support/shared_examples/graphql/projects/services_resolver_shared_examples.rb @@ -1,12 +1,12 @@ # frozen_string_literal: true -shared_examples 'no project services' do +RSpec.shared_examples 'no project services' do it 'returns empty collection' do expect(resolve_services).to eq [] end end -shared_examples 'cannot access project services' do +RSpec.shared_examples 'cannot access project services' do it 'raises error' do expect do resolve_services diff --git a/spec/support/shared_examples/helm_commands_shared_examples.rb b/spec/support/shared_examples/helm_commands_shared_examples.rb index f0624fbf29f..0a94c6648cc 100644 --- a/spec/support/shared_examples/helm_commands_shared_examples.rb +++ b/spec/support/shared_examples/helm_commands_shared_examples.rb @@ -1,6 +1,6 @@ # frozen_string_literal: true -shared_examples 'helm command generator' do +RSpec.shared_examples 'helm command generator' do describe '#generate_script' do let(:helm_setup) do <<~EOS @@ -14,7 +14,7 @@ shared_examples 'helm command generator' do end end -shared_examples 'helm command' do +RSpec.shared_examples 'helm command' do describe '#rbac?' do subject { command.rbac? } diff --git a/spec/support/shared_examples/lib/gitlab/background_migration/mentions_migration_shared_examples.rb b/spec/support/shared_examples/lib/gitlab/background_migration/mentions_migration_shared_examples.rb index a40c38106e2..af65b61021c 100644 --- a/spec/support/shared_examples/lib/gitlab/background_migration/mentions_migration_shared_examples.rb +++ b/spec/support/shared_examples/lib/gitlab/background_migration/mentions_migration_shared_examples.rb @@ -1,6 +1,6 @@ # frozen_string_literal: true -shared_examples 'resource mentions migration' do |migration_class, resource_class| +RSpec.shared_examples 'resource mentions migration' do |migration_class, resource_class| it 'migrates resource mentions' do join = migration_class::JOIN conditions = migration_class::QUERY_CONDITIONS @@ -21,7 +21,7 @@ shared_examples 'resource mentions migration' do |migration_class, resource_clas end end -shared_examples 'resource notes mentions migration' do |migration_class, resource_class| +RSpec.shared_examples 'resource notes mentions migration' do |migration_class, resource_class| it 'migrates mentions from note' do join = migration_class::JOIN conditions = migration_class::QUERY_CONDITIONS @@ -56,7 +56,7 @@ shared_examples 'resource notes mentions migration' do |migration_class, resourc end end -shared_examples 'schedules resource mentions migration' do |resource_class, is_for_notes| +RSpec.shared_examples 'schedules resource mentions migration' do |resource_class, is_for_notes| before do stub_const("#{described_class.name}::BATCH_SIZE", 1) end diff --git a/spec/support/shared_examples/lib/gitlab/cycle_analytics/base_stage_shared_examples.rb b/spec/support/shared_examples/lib/gitlab/cycle_analytics/base_stage_shared_examples.rb index 14292f70228..d76089d56dd 100644 --- a/spec/support/shared_examples/lib/gitlab/cycle_analytics/base_stage_shared_examples.rb +++ b/spec/support/shared_examples/lib/gitlab/cycle_analytics/base_stage_shared_examples.rb @@ -4,7 +4,7 @@ require 'spec_helper' ISSUES_MEDIAN = 30.minutes.to_i -shared_examples 'base stage' do +RSpec.shared_examples 'base stage' do let(:stage) { described_class.new(options: { project: double }) } before do @@ -35,7 +35,7 @@ shared_examples 'base stage' do end end -shared_examples 'calculate #median with date range' do +RSpec.shared_examples 'calculate #median with date range' do context 'when valid date range is given' do before do stage_options[:from] = 5.days.ago @@ -55,7 +55,7 @@ shared_examples 'calculate #median with date range' do end end -shared_examples 'Gitlab::Analytics::CycleAnalytics::DataCollector backend examples' do +RSpec.shared_examples 'Gitlab::Analytics::CycleAnalytics::DataCollector backend examples' do let(:stage_params) { Gitlab::Analytics::CycleAnalytics::DefaultStages.send("params_for_#{stage_name}_stage").merge(project: project) } let(:stage) { Analytics::CycleAnalytics::ProjectStage.new(stage_params) } let(:data_collector) { Gitlab::Analytics::CycleAnalytics::DataCollector.new(stage: stage, params: { from: stage_options[:from], current_user: project.creator }) } diff --git a/spec/support/shared_examples/lib/gitlab/cycle_analytics/default_query_config_shared_examples.rb b/spec/support/shared_examples/lib/gitlab/cycle_analytics/default_query_config_shared_examples.rb index c053af010b3..4f648b27ea2 100644 --- a/spec/support/shared_examples/lib/gitlab/cycle_analytics/default_query_config_shared_examples.rb +++ b/spec/support/shared_examples/lib/gitlab/cycle_analytics/default_query_config_shared_examples.rb @@ -2,7 +2,7 @@ require 'spec_helper' -shared_examples 'default query config' do +RSpec.shared_examples 'default query config' do let(:project) { create(:project) } let(:event) { described_class.new(stage: stage_name, options: { from: 1.day.ago, project: project }) } diff --git a/spec/support/shared_examples/lib/gitlab/diff_file_collections_shared_examples.rb b/spec/support/shared_examples/lib/gitlab/diff_file_collections_shared_examples.rb index a1cdd054f32..a9e7b15d9bc 100644 --- a/spec/support/shared_examples/lib/gitlab/diff_file_collections_shared_examples.rb +++ b/spec/support/shared_examples/lib/gitlab/diff_file_collections_shared_examples.rb @@ -10,7 +10,7 @@ RSpec.shared_examples 'diff statistics' do |test_include_stats_flag: true| end end - context 'when should request diff stats' do + context 'when include_stats is true' do it 'Repository#diff_stats is called' do expect(diffable.project.repository) .to receive(:diff_stats) @@ -59,43 +59,134 @@ RSpec.shared_examples 'unfoldable diff' do end RSpec.shared_examples 'cacheable diff collection' do - let(:cache) { instance_double(Gitlab::Diff::HighlightCache) } + let(:highlight_cache) { instance_double(Gitlab::Diff::HighlightCache, write_if_empty: true, clear: nil, decorate: nil) } + let(:stats_cache) { instance_double(Gitlab::Diff::StatsCache, read: nil, write_if_empty: true, clear: nil) } before do - expect(Gitlab::Diff::HighlightCache).to receive(:new).with(subject) { cache } + expect(Gitlab::Diff::HighlightCache).to receive(:new).with(subject) { highlight_cache } end describe '#write_cache' do it 'calls Gitlab::Diff::HighlightCache#write_if_empty' do - expect(cache).to receive(:write_if_empty).once + expect(highlight_cache).to receive(:write_if_empty).once subject.write_cache end + + context 'when the feature flag is enabled' do + before do + stub_feature_flags(cache_diff_stats_merge_request: true) + expect(Gitlab::Diff::StatsCache).to receive(:new).with(cachable_key: diffable.cache_key) { stats_cache } + end + + it 'calls Gitlab::Diff::StatsCache#write_if_empty with diff stats' do + diff_stats = Gitlab::Git::DiffStatsCollection.new([]) + + expect(diffable.project.repository) + .to receive(:diff_stats).and_return(diff_stats) + + expect(stats_cache).to receive(:write_if_empty).once.with(diff_stats) + + subject.write_cache + end + end + + context 'when the feature flag is disabled' do + before do + stub_feature_flags(cache_diff_stats_merge_request: false) + end + + it 'does not call Gitlab::Diff::StatsCache#write_if_empty' do + expect(stats_cache).not_to receive(:write_if_empty) + + subject.write_cache + end + end end describe '#clear_cache' do it 'calls Gitlab::Diff::HighlightCache#clear' do - expect(cache).to receive(:clear).once + expect(highlight_cache).to receive(:clear).once subject.clear_cache end - end - describe '#cache_key' do - it 'calls Gitlab::Diff::HighlightCache#key' do - expect(cache).to receive(:key).once + context 'when the feature flag is enabled' do + before do + stub_feature_flags(cache_diff_stats_merge_request: true) + expect(Gitlab::Diff::StatsCache).to receive(:new).with(cachable_key: diffable.cache_key) { stats_cache } + end - subject.cache_key + it 'calls Gitlab::Diff::StatsCache#clear' do + expect(stats_cache).to receive(:clear).once + + subject.clear_cache + end + end + + context 'when the feature flag is disabled' do + before do + stub_feature_flags(cache_diff_stats_merge_request: false) + end + + it 'does not calls Gitlab::Diff::StatsCache#clear' do + expect(stats_cache).not_to receive(:clear) + + subject.clear_cache + end end end describe '#diff_files' do it 'calls Gitlab::Diff::HighlightCache#decorate' do - expect(cache).to receive(:decorate) + expect(highlight_cache).to receive(:decorate) .with(instance_of(Gitlab::Diff::File)) .exactly(cacheable_files_count).times subject.diff_files end + + context 'when the feature swtich is enabled' do + before do + stub_feature_flags(cache_diff_stats_merge_request: true) + expect(Gitlab::Diff::StatsCache).to receive(:new).with(cachable_key: diffable.cache_key) { stats_cache } + end + + context 'when there are stats cached' do + before do + allow(stats_cache).to receive(:read).and_return(Gitlab::Git::DiffStatsCollection.new([])) + end + + it 'does not make a diff stats rpc call' do + expect(diffable.project.repository).not_to receive(:diff_stats) + + subject.diff_files + end + end + + context 'when there are no stats cached' do + it 'makes a diff stats rpc call' do + expect(diffable.project.repository) + .to receive(:diff_stats) + .with(diffable.diff_refs.base_sha, diffable.diff_refs.head_sha) + + subject.diff_files + end + end + end + + context 'when the feature switch is disabled' do + before do + stub_feature_flags(cache_diff_stats_merge_request: false) + end + + it 'makes a diff stats rpc call' do + expect(diffable.project.repository) + .to receive(:diff_stats) + .with(diffable.diff_refs.base_sha, diffable.diff_refs.head_sha) + + subject.diff_files + end + end end end diff --git a/spec/support/shared_examples/lib/gitlab/import/stuck_import_job_workers_shared_examples.rb b/spec/support/shared_examples/lib/gitlab/import/stuck_import_job_workers_shared_examples.rb index 06ea540706a..222390cf9cd 100644 --- a/spec/support/shared_examples/lib/gitlab/import/stuck_import_job_workers_shared_examples.rb +++ b/spec/support/shared_examples/lib/gitlab/import/stuck_import_job_workers_shared_examples.rb @@ -1,6 +1,6 @@ # frozen_string_literal: true -shared_examples 'stuck import job detection' do +RSpec.shared_examples 'stuck import job detection' do context 'when the job has completed' do context 'when the import status was already updated' do before do diff --git a/spec/support/shared_examples/lib/gitlab/jira_import/base_importer_shared_examples.rb b/spec/support/shared_examples/lib/gitlab/jira_import/base_importer_shared_examples.rb index 85dcc053447..b1788bb5912 100644 --- a/spec/support/shared_examples/lib/gitlab/jira_import/base_importer_shared_examples.rb +++ b/spec/support/shared_examples/lib/gitlab/jira_import/base_importer_shared_examples.rb @@ -1,5 +1,5 @@ # frozen_string_literal: true -shared_examples 'raise exception if not implemented' do +RSpec.shared_examples 'raise exception if not implemented' do it { expect { described_class.new(project).imported_items_cache_key }.not_to raise_error } end diff --git a/spec/support/shared_examples/models/jira_import_state_shared_examples.rb b/spec/support/shared_examples/models/jira_import_state_shared_examples.rb index f4643375c8e..1999f0f3c49 100644 --- a/spec/support/shared_examples/models/jira_import_state_shared_examples.rb +++ b/spec/support/shared_examples/models/jira_import_state_shared_examples.rb @@ -1,6 +1,6 @@ # frozen_string_literal: true -shared_examples 'multiple running imports not allowed' do +RSpec.shared_examples 'multiple running imports not allowed' do it 'returns not valid' do new_import = build(:jira_import_state, project: project) @@ -9,21 +9,21 @@ shared_examples 'multiple running imports not allowed' do end end -shared_examples 'in progress' do |status| +RSpec.shared_examples 'in progress' do |status| it 'returns true' do jira_import_state = build(:jira_import_state, status: status) expect(jira_import_state).to be_in_progress end end -shared_examples 'not in progress' do |status| +RSpec.shared_examples 'not in progress' do |status| it 'returns false' do jira_import_state = build(:jira_import_state, status: status) expect(jira_import_state).not_to be_in_progress end end -shared_examples 'can transition' do |states| +RSpec.shared_examples 'can transition' do |states| states.each do |state| it 'returns true' do expect(jira_import.send(state)).to be true @@ -31,7 +31,7 @@ shared_examples 'can transition' do |states| end end -shared_examples 'cannot transition' do |states| +RSpec.shared_examples 'cannot transition' do |states| states.each do |state| it 'returns false' do expect(jira_import.send(state)).to be false diff --git a/spec/support/shared_examples/models/note_access_check_shared_examples.rb b/spec/support/shared_examples/models/note_access_check_shared_examples.rb index 3bafad202f6..44edafe9091 100644 --- a/spec/support/shared_examples/models/note_access_check_shared_examples.rb +++ b/spec/support/shared_examples/models/note_access_check_shared_examples.rb @@ -1,6 +1,6 @@ # frozen_string_literal: true -shared_examples 'users with note access' do +RSpec.shared_examples 'users with note access' do it 'returns true' do users.each do |user| expect(note.system_note_with_references_visible_for?(user)).to be_truthy @@ -9,7 +9,7 @@ shared_examples 'users with note access' do end end -shared_examples 'users without note access' do +RSpec.shared_examples 'users without note access' do it 'returns false' do users.each do |user| expect(note.system_note_with_references_visible_for?(user)).to be_falsy diff --git a/spec/support/shared_examples/requests/api/graphql/projects/services_shared_examples.rb b/spec/support/shared_examples/requests/api/graphql/projects/services_shared_examples.rb index 246f1850c3c..da1caef63ba 100644 --- a/spec/support/shared_examples/requests/api/graphql/projects/services_shared_examples.rb +++ b/spec/support/shared_examples/requests/api/graphql/projects/services_shared_examples.rb @@ -1,6 +1,6 @@ # frozen_string_literal: true -shared_examples 'unauthorized users cannot read services' do +RSpec.shared_examples 'unauthorized users cannot read services' do before do post_graphql(query, current_user: current_user) end diff --git a/spec/support/shared_examples/resource_events.rb b/spec/support/shared_examples/resource_events.rb index 66f5e760c37..f4fb6e943f7 100644 --- a/spec/support/shared_examples/resource_events.rb +++ b/spec/support/shared_examples/resource_events.rb @@ -2,7 +2,7 @@ require 'spec_helper' -shared_examples 'a resource event' do +RSpec.shared_examples 'a resource event' do let_it_be(:user1) { create(:user) } let_it_be(:user2) { create(:user) } @@ -54,7 +54,7 @@ shared_examples 'a resource event' do end end -shared_examples 'a resource event for issues' do +RSpec.shared_examples 'a resource event for issues' do let_it_be(:user1) { create(:user) } let_it_be(:user2) { create(:user) } @@ -103,7 +103,7 @@ shared_examples 'a resource event for issues' do end end -shared_examples 'a resource event for merge requests' do +RSpec.shared_examples 'a resource event for merge requests' do let_it_be(:user1) { create(:user) } let_it_be(:user2) { create(:user) } diff --git a/spec/support/shared_examples/services/jira_import/start_import_service_shared_examples.rb b/spec/support/shared_examples/services/jira_import/start_import_service_shared_examples.rb index c5e56ed3539..8fd76f7cb1f 100644 --- a/spec/support/shared_examples/services/jira_import/start_import_service_shared_examples.rb +++ b/spec/support/shared_examples/services/jira_import/start_import_service_shared_examples.rb @@ -1,6 +1,6 @@ # frozen_string_literal: true -shared_examples 'responds with error' do |message| +RSpec.shared_examples 'responds with error' do |message| it 'returns error' do expect(subject).to be_a(ServiceResponse) expect(subject).to be_error diff --git a/spec/support/shared_examples/services/resource_events/change_milestone_service_shared_examples.rb b/spec/support/shared_examples/services/resource_events/change_milestone_service_shared_examples.rb index c5f84e205cf..ef41c2fcc13 100644 --- a/spec/support/shared_examples/services/resource_events/change_milestone_service_shared_examples.rb +++ b/spec/support/shared_examples/services/resource_events/change_milestone_service_shared_examples.rb @@ -1,6 +1,6 @@ # frozen_string_literal: true -shared_examples 'a milestone events creator' do +RSpec.shared_examples 'a milestone events creator' do let_it_be(:user) { create(:user) } let(:created_at_time) { Time.utc(2019, 12, 30) } diff --git a/spec/support/shared_examples/uploaders/upload_type_shared_examples.rb b/spec/support/shared_examples/uploaders/upload_type_shared_examples.rb index e58723324d3..9e0104e1410 100644 --- a/spec/support/shared_examples/uploaders/upload_type_shared_examples.rb +++ b/spec/support/shared_examples/uploaders/upload_type_shared_examples.rb @@ -2,7 +2,7 @@ # @param path [String] the path to file to upload. E.g. File.join('spec', 'fixtures', 'sanitized.svg') # @param uploader [CarrierWave::Uploader::Base] uploader to handle the upload. -shared_examples 'denied carrierwave upload' do +RSpec.shared_examples 'denied carrierwave upload' do it 'will deny upload' do fixture_file = fixture_file_upload(path) expect { uploader.cache!(fixture_file) }.to raise_exception(CarrierWave::IntegrityError) @@ -11,7 +11,7 @@ end # @param path [String] the path to file to upload. E.g. File.join('spec', 'fixtures', 'sanitized.svg') # @param uploader [CarrierWave::Uploader::Base] uploader to handle the upload. -shared_examples 'accepted carrierwave upload' do +RSpec.shared_examples 'accepted carrierwave upload' do let(:fixture_file) { fixture_file_upload(path) } before do @@ -30,7 +30,7 @@ end # @param path [String] the path to file to upload. E.g. File.join('spec', 'fixtures', 'sanitized.svg') # @param uploader [CarrierWave::Uploader::Base] uploader to handle the upload. # @param content_type [String] the upload file content type after cache -shared_examples 'upload with content type' do |content_type| +RSpec.shared_examples 'upload with content type' do |content_type| let(:fixture_file) { fixture_file_upload(path, content_type) } it 'will not change upload file content type' do diff --git a/spec/support/shared_examples/views/pipeline_status_changes_email.rb b/spec/support/shared_examples/views/pipeline_status_changes_email.rb index 15b4ce9c44e..698f11c2216 100644 --- a/spec/support/shared_examples/views/pipeline_status_changes_email.rb +++ b/spec/support/shared_examples/views/pipeline_status_changes_email.rb @@ -1,6 +1,6 @@ # frozen_string_literal: true -shared_examples 'pipeline status changes email' do +RSpec.shared_examples 'pipeline status changes email' do include Devise::Test::ControllerHelpers let(:user) { create(:user, developer_projects: [project]) } diff --git a/spec/support/shared_examples/workers/gitlab/jira_import/jira_import_workers_shared_examples.rb b/spec/support/shared_examples/workers/gitlab/jira_import/jira_import_workers_shared_examples.rb index ae8c82cb67c..2cca76c8fe3 100644 --- a/spec/support/shared_examples/workers/gitlab/jira_import/jira_import_workers_shared_examples.rb +++ b/spec/support/shared_examples/workers/gitlab/jira_import/jira_import_workers_shared_examples.rb @@ -1,6 +1,6 @@ # frozen_string_literal: true -shared_examples 'include import workers modules' do +RSpec.shared_examples 'include import workers modules' do it { expect(described_class).to include_module(ApplicationWorker) } it { expect(described_class).to include_module(Gitlab::JiraImport::QueueOptions) } @@ -12,7 +12,7 @@ shared_examples 'include import workers modules' do end end -shared_examples 'does not advance to next stage' do +RSpec.shared_examples 'does not advance to next stage' do it 'does not advance to next stage' do expect(Gitlab::JiraImport::AdvanceStageWorker).not_to receive(:perform_async) @@ -20,7 +20,7 @@ shared_examples 'does not advance to next stage' do end end -shared_examples 'cannot do Jira import' do +RSpec.shared_examples 'cannot do Jira import' do it 'does not advance to next stage' do worker = described_class.new expect(worker).not_to receive(:import) @@ -29,7 +29,7 @@ shared_examples 'cannot do Jira import' do end end -shared_examples 'advance to next stage' do |next_stage| +RSpec.shared_examples 'advance to next stage' do |next_stage| let(:job_waiter) { Gitlab::JobWaiter.new(2, 'some-job-key') } it "advances to #{next_stage} stage" do diff --git a/spec/support_specs/helpers/active_record/query_recorder_spec.rb b/spec/support_specs/helpers/active_record/query_recorder_spec.rb index d15fbb5d4c3..f968f511a2a 100644 --- a/spec/support_specs/helpers/active_record/query_recorder_spec.rb +++ b/spec/support_specs/helpers/active_record/query_recorder_spec.rb @@ -2,7 +2,7 @@ require 'spec_helper' -describe ActiveRecord::QueryRecorder do +RSpec.describe ActiveRecord::QueryRecorder do before do stub_const('TestQueries', Class.new(ActiveRecord::Base)) diff --git a/spec/support_specs/helpers/graphql_helpers_spec.rb b/spec/support_specs/helpers/graphql_helpers_spec.rb index bfc71f519cf..bc777621674 100644 --- a/spec/support_specs/helpers/graphql_helpers_spec.rb +++ b/spec/support_specs/helpers/graphql_helpers_spec.rb @@ -2,7 +2,7 @@ require 'spec_helper' -describe GraphqlHelpers do +RSpec.describe GraphqlHelpers do include GraphqlHelpers describe '.graphql_mutation' do diff --git a/spec/support_specs/helpers/stub_feature_flags_spec.rb b/spec/support_specs/helpers/stub_feature_flags_spec.rb index e90a7f68a90..8d5f16751ae 100644 --- a/spec/support_specs/helpers/stub_feature_flags_spec.rb +++ b/spec/support_specs/helpers/stub_feature_flags_spec.rb @@ -2,7 +2,7 @@ require 'spec_helper' -describe StubFeatureFlags do +RSpec.describe StubFeatureFlags do let(:feature_name) { :test_feature } describe '#stub_feature_flags' do diff --git a/spec/support_specs/matchers/exceed_query_limit_helpers_spec.rb b/spec/support_specs/matchers/exceed_query_limit_helpers_spec.rb index 4a711b43d9a..15b846f28cb 100644 --- a/spec/support_specs/matchers/exceed_query_limit_helpers_spec.rb +++ b/spec/support_specs/matchers/exceed_query_limit_helpers_spec.rb @@ -2,7 +2,7 @@ require 'spec_helper' -describe ExceedQueryLimitHelpers do +RSpec.describe ExceedQueryLimitHelpers do before do stub_const('TestQueries', Class.new(ActiveRecord::Base)) stub_const('TestMatcher', Class.new) diff --git a/spec/tasks/cache/clear/redis_spec.rb b/spec/tasks/cache/clear/redis_spec.rb index 4f597988763..d2de068f254 100644 --- a/spec/tasks/cache/clear/redis_spec.rb +++ b/spec/tasks/cache/clear/redis_spec.rb @@ -2,7 +2,7 @@ require 'rake_helper' -describe 'clearing redis cache' do +RSpec.describe 'clearing redis cache' do before do Rake.application.rake_require 'tasks/cache' end diff --git a/spec/tasks/config_lint_spec.rb b/spec/tasks/config_lint_spec.rb index c6c11d76388..f5a382989ea 100644 --- a/spec/tasks/config_lint_spec.rb +++ b/spec/tasks/config_lint_spec.rb @@ -3,7 +3,7 @@ require 'rake_helper' Rake.application.rake_require 'tasks/config_lint' -describe ConfigLint do +RSpec.describe ConfigLint do let(:files) { ['lib/support/fake.sh'] } it 'errors out if any bash scripts have errors' do @@ -15,7 +15,7 @@ describe ConfigLint do end end -describe 'config_lint rake task' do +RSpec.describe 'config_lint rake task' do before do # Prevent `system` from actually being called allow(Kernel).to receive(:system).and_return(true) diff --git a/spec/tasks/gitlab/artifacts/check_rake_spec.rb b/spec/tasks/gitlab/artifacts/check_rake_spec.rb index 04015f0e21a..d1d02ab9bc5 100644 --- a/spec/tasks/gitlab/artifacts/check_rake_spec.rb +++ b/spec/tasks/gitlab/artifacts/check_rake_spec.rb @@ -2,7 +2,7 @@ require 'rake_helper' -describe 'gitlab:artifacts rake tasks' do +RSpec.describe 'gitlab:artifacts rake tasks' do describe 'check' do let!(:artifact) { create(:ci_job_artifact, :archive, :correct_checksum) } diff --git a/spec/tasks/gitlab/artifacts/migrate_rake_spec.rb b/spec/tasks/gitlab/artifacts/migrate_rake_spec.rb index 9ee00b4297b..94a8da9478a 100644 --- a/spec/tasks/gitlab/artifacts/migrate_rake_spec.rb +++ b/spec/tasks/gitlab/artifacts/migrate_rake_spec.rb @@ -2,7 +2,7 @@ require 'rake_helper' -describe 'gitlab:artifacts namespace rake task' do +RSpec.describe 'gitlab:artifacts namespace rake task' do before(:context) do Rake.application.rake_require 'tasks/gitlab/artifacts/migrate' end diff --git a/spec/tasks/gitlab/backup_rake_spec.rb b/spec/tasks/gitlab/backup_rake_spec.rb index febc18e497a..661ce8e74d2 100644 --- a/spec/tasks/gitlab/backup_rake_spec.rb +++ b/spec/tasks/gitlab/backup_rake_spec.rb @@ -3,7 +3,7 @@ require 'spec_helper' require 'rake' -describe 'gitlab:app namespace rake task', :delete do +RSpec.describe 'gitlab:app namespace rake task', :delete do let(:enable_registry) { true } def tars_glob diff --git a/spec/tasks/gitlab/check_rake_spec.rb b/spec/tasks/gitlab/check_rake_spec.rb index e3e2a22add9..7956b5c57e6 100644 --- a/spec/tasks/gitlab/check_rake_spec.rb +++ b/spec/tasks/gitlab/check_rake_spec.rb @@ -2,7 +2,7 @@ require 'rake_helper' -describe 'check.rake' do +RSpec.describe 'check.rake' do before do Rake.application.rake_require 'tasks/gitlab/check' diff --git a/spec/tasks/gitlab/cleanup_rake_spec.rb b/spec/tasks/gitlab/cleanup_rake_spec.rb index 8db18895c24..dc460611169 100644 --- a/spec/tasks/gitlab/cleanup_rake_spec.rb +++ b/spec/tasks/gitlab/cleanup_rake_spec.rb @@ -2,7 +2,7 @@ require 'rake_helper' -describe 'gitlab:cleanup rake tasks' do +RSpec.describe 'gitlab:cleanup rake tasks' do before do Rake.application.rake_require 'tasks/gitlab/cleanup' end diff --git a/spec/tasks/gitlab/container_registry_rake_spec.rb b/spec/tasks/gitlab/container_registry_rake_spec.rb index 181d5c8b7c8..6cb5c30cc31 100644 --- a/spec/tasks/gitlab/container_registry_rake_spec.rb +++ b/spec/tasks/gitlab/container_registry_rake_spec.rb @@ -2,7 +2,7 @@ require 'rake_helper' -describe 'gitlab:container_registry namespace rake tasks' do +RSpec.describe 'gitlab:container_registry namespace rake tasks' do let_it_be(:application_settings) { Gitlab::CurrentSettings } let_it_be(:api_url) { 'http://registry.gitlab' } diff --git a/spec/tasks/gitlab/db_rake_spec.rb b/spec/tasks/gitlab/db_rake_spec.rb index c3da5af5439..a78506803be 100644 --- a/spec/tasks/gitlab/db_rake_spec.rb +++ b/spec/tasks/gitlab/db_rake_spec.rb @@ -3,7 +3,7 @@ require 'spec_helper' require 'rake' -describe 'gitlab:db namespace rake task' do +RSpec.describe 'gitlab:db namespace rake task' do before :all do Rake.application.rake_require 'active_record/railties/databases' Rake.application.rake_require 'tasks/seed_fu' diff --git a/spec/tasks/gitlab/generate_sample_prometheus_data_spec.rb b/spec/tasks/gitlab/generate_sample_prometheus_data_spec.rb index 7620047624a..a8effef2d7b 100644 --- a/spec/tasks/gitlab/generate_sample_prometheus_data_spec.rb +++ b/spec/tasks/gitlab/generate_sample_prometheus_data_spec.rb @@ -2,7 +2,7 @@ require 'rake_helper' -describe 'gitlab:generate_sample_prometheus_data rake task' do +RSpec.describe 'gitlab:generate_sample_prometheus_data rake task' do let(:cluster) { create(:cluster, :provided_by_user, :project) } let(:environment) { create(:environment, project: cluster.project) } let(:sample_query_file) { File.join(Rails.root, Metrics::SampleMetricsService::DIRECTORY, 'test_query_result.yml') } diff --git a/spec/tasks/gitlab/git_rake_spec.rb b/spec/tasks/gitlab/git_rake_spec.rb index b8156e55ec7..4bc1b460d9b 100644 --- a/spec/tasks/gitlab/git_rake_spec.rb +++ b/spec/tasks/gitlab/git_rake_spec.rb @@ -2,7 +2,7 @@ require 'rake_helper' -describe 'gitlab:git rake tasks' do +RSpec.describe 'gitlab:git rake tasks' do let(:base_path) { 'tmp/tests/default_storage' } let!(:project) { create(:project, :repository) } diff --git a/spec/tasks/gitlab/gitaly_rake_spec.rb b/spec/tasks/gitlab/gitaly_rake_spec.rb index d9fdc183bfe..c59370a7a32 100644 --- a/spec/tasks/gitlab/gitaly_rake_spec.rb +++ b/spec/tasks/gitlab/gitaly_rake_spec.rb @@ -2,7 +2,7 @@ require 'rake_helper' -describe 'gitlab:gitaly namespace rake task' do +RSpec.describe 'gitlab:gitaly namespace rake task' do before :all do Rake.application.rake_require 'tasks/gitlab/gitaly' end diff --git a/spec/tasks/gitlab/info_rake_spec.rb b/spec/tasks/gitlab/info_rake_spec.rb index 8d6b3985380..941f3429017 100644 --- a/spec/tasks/gitlab/info_rake_spec.rb +++ b/spec/tasks/gitlab/info_rake_spec.rb @@ -2,7 +2,7 @@ require 'rake_helper' -describe 'gitlab:env:info' do +RSpec.describe 'gitlab:env:info' do before do Rake.application.rake_require 'tasks/gitlab/info' diff --git a/spec/tasks/gitlab/ldap_rake_spec.rb b/spec/tasks/gitlab/ldap_rake_spec.rb index bbc3f625088..275fcb98dd0 100644 --- a/spec/tasks/gitlab/ldap_rake_spec.rb +++ b/spec/tasks/gitlab/ldap_rake_spec.rb @@ -2,7 +2,7 @@ require 'rake_helper' -describe 'gitlab:ldap:rename_provider rake task' do +RSpec.describe 'gitlab:ldap:rename_provider rake task' do it 'completes without error' do Rake.application.rake_require 'tasks/gitlab/ldap' stub_warn_user_is_not_gitlab diff --git a/spec/tasks/gitlab/lfs/check_rake_spec.rb b/spec/tasks/gitlab/lfs/check_rake_spec.rb index 3d698efdcb6..fd1b6d010e4 100644 --- a/spec/tasks/gitlab/lfs/check_rake_spec.rb +++ b/spec/tasks/gitlab/lfs/check_rake_spec.rb @@ -2,7 +2,7 @@ require 'rake_helper' -describe 'gitlab:lfs rake tasks' do +RSpec.describe 'gitlab:lfs rake tasks' do describe 'check' do let!(:lfs_object) { create(:lfs_object, :with_file, :correct_oid) } diff --git a/spec/tasks/gitlab/lfs/migrate_rake_spec.rb b/spec/tasks/gitlab/lfs/migrate_rake_spec.rb index fc7be0eebcd..a59da615b94 100644 --- a/spec/tasks/gitlab/lfs/migrate_rake_spec.rb +++ b/spec/tasks/gitlab/lfs/migrate_rake_spec.rb @@ -2,7 +2,7 @@ require 'rake_helper' -describe 'gitlab:lfs namespace rake task' do +RSpec.describe 'gitlab:lfs namespace rake task' do before :all do Rake.application.rake_require 'tasks/gitlab/lfs/migrate' end diff --git a/spec/tasks/gitlab/praefect_rake_spec.rb b/spec/tasks/gitlab/praefect_rake_spec.rb index d986a778c8c..c67dba110c7 100644 --- a/spec/tasks/gitlab/praefect_rake_spec.rb +++ b/spec/tasks/gitlab/praefect_rake_spec.rb @@ -2,7 +2,7 @@ require 'rake_helper' -describe 'gitlab:praefect:replicas' do +RSpec.describe 'gitlab:praefect:replicas' do before do Rake.application.rake_require 'tasks/gitlab/praefect' end diff --git a/spec/tasks/gitlab/seed/group_seed_rake_spec.rb b/spec/tasks/gitlab/seed/group_seed_rake_spec.rb index ecf4e9575ab..0b69615eebc 100644 --- a/spec/tasks/gitlab/seed/group_seed_rake_spec.rb +++ b/spec/tasks/gitlab/seed/group_seed_rake_spec.rb @@ -2,7 +2,7 @@ require 'rake_helper' -describe 'gitlab:seed:group_seed rake task' do +RSpec.describe 'gitlab:seed:group_seed rake task' do let(:username) { 'group_seed' } let!(:user) { create(:user, username: username) } let(:task_params) { [2, username] } diff --git a/spec/tasks/gitlab/shell_rake_spec.rb b/spec/tasks/gitlab/shell_rake_spec.rb index 08b3fea0c80..a929daddb67 100644 --- a/spec/tasks/gitlab/shell_rake_spec.rb +++ b/spec/tasks/gitlab/shell_rake_spec.rb @@ -2,7 +2,7 @@ require 'rake_helper' -describe 'gitlab:shell rake tasks' do +RSpec.describe 'gitlab:shell rake tasks' do before do Rake.application.rake_require 'tasks/gitlab/shell' diff --git a/spec/tasks/gitlab/snippets_rake_spec.rb b/spec/tasks/gitlab/snippets_rake_spec.rb index c4bb8d7897c..f21922e14b8 100644 --- a/spec/tasks/gitlab/snippets_rake_spec.rb +++ b/spec/tasks/gitlab/snippets_rake_spec.rb @@ -2,7 +2,7 @@ require 'rake_helper' -describe 'gitlab:snippets namespace rake task' do +RSpec.describe 'gitlab:snippets namespace rake task' do let_it_be(:user) { create(:user)} let_it_be(:migrated) { create(:personal_snippet, :repository, author: user) } let(:non_migrated) { create_list(:personal_snippet, 3, author: user) } diff --git a/spec/tasks/gitlab/storage_rake_spec.rb b/spec/tasks/gitlab/storage_rake_spec.rb index 226d3aaab4e..abd44adbdcc 100644 --- a/spec/tasks/gitlab/storage_rake_spec.rb +++ b/spec/tasks/gitlab/storage_rake_spec.rb @@ -2,7 +2,7 @@ require 'rake_helper' -describe 'rake gitlab:storage:*' do +RSpec.describe 'rake gitlab:storage:*' do before do Rake.application.rake_require 'tasks/gitlab/storage' diff --git a/spec/tasks/gitlab/task_helpers_spec.rb b/spec/tasks/gitlab/task_helpers_spec.rb index 8e6872f4d6f..2921913319b 100644 --- a/spec/tasks/gitlab/task_helpers_spec.rb +++ b/spec/tasks/gitlab/task_helpers_spec.rb @@ -6,7 +6,7 @@ class TestHelpersTest include Gitlab::TaskHelpers end -describe Gitlab::TaskHelpers do +RSpec.describe Gitlab::TaskHelpers do subject { TestHelpersTest.new } let(:repo) { 'https://gitlab.com/gitlab-org/gitlab-test.git' } diff --git a/spec/tasks/gitlab/update_templates_rake_spec.rb b/spec/tasks/gitlab/update_templates_rake_spec.rb index 14b4ad5e3d8..25151a2f3ae 100644 --- a/spec/tasks/gitlab/update_templates_rake_spec.rb +++ b/spec/tasks/gitlab/update_templates_rake_spec.rb @@ -2,7 +2,7 @@ require 'rake_helper' -describe 'gitlab:update_project_templates rake task' do +RSpec.describe 'gitlab:update_project_templates rake task' do let!(:tmpdir) { Dir.mktmpdir } before do diff --git a/spec/tasks/gitlab/uploads/check_rake_spec.rb b/spec/tasks/gitlab/uploads/check_rake_spec.rb index 91f0cedb246..4c6f16dbcf9 100644 --- a/spec/tasks/gitlab/uploads/check_rake_spec.rb +++ b/spec/tasks/gitlab/uploads/check_rake_spec.rb @@ -2,7 +2,7 @@ require 'rake_helper' -describe 'gitlab:uploads rake tasks' do +RSpec.describe 'gitlab:uploads rake tasks' do describe 'check' do let!(:upload) { create(:upload, path: Rails.root.join('spec/fixtures/banana_sample.gif')) } diff --git a/spec/tasks/gitlab/uploads/migrate_rake_spec.rb b/spec/tasks/gitlab/uploads/migrate_rake_spec.rb index 49026cd74f9..7f0f5c6767d 100644 --- a/spec/tasks/gitlab/uploads/migrate_rake_spec.rb +++ b/spec/tasks/gitlab/uploads/migrate_rake_spec.rb @@ -2,7 +2,7 @@ require 'rake_helper' -describe 'gitlab:uploads:migrate and migrate_to_local rake tasks' do +RSpec.describe 'gitlab:uploads:migrate and migrate_to_local rake tasks' do let(:model_class) { nil } let(:uploader_class) { nil } let(:mounted_as) { nil } diff --git a/spec/tasks/gitlab/web_hook_rake_spec.rb b/spec/tasks/gitlab/web_hook_rake_spec.rb index ee3c7e034f3..3e18ce5ab29 100644 --- a/spec/tasks/gitlab/web_hook_rake_spec.rb +++ b/spec/tasks/gitlab/web_hook_rake_spec.rb @@ -2,7 +2,7 @@ require 'rake_helper' -describe 'gitlab:web_hook namespace rake tasks' do +RSpec.describe 'gitlab:web_hook namespace rake tasks' do let_it_be(:group, refind: true) { create(:group) } let_it_be(:project1, reload: true) { create(:project, namespace: group) } let_it_be(:project2, reload: true) { create(:project, namespace: group) } diff --git a/spec/tasks/gitlab/workhorse_rake_spec.rb b/spec/tasks/gitlab/workhorse_rake_spec.rb index 139652ac258..2efbf0febac 100644 --- a/spec/tasks/gitlab/workhorse_rake_spec.rb +++ b/spec/tasks/gitlab/workhorse_rake_spec.rb @@ -2,7 +2,7 @@ require 'rake_helper' -describe 'gitlab:workhorse namespace rake task' do +RSpec.describe 'gitlab:workhorse namespace rake task' do before :all do Rake.application.rake_require 'tasks/gitlab/workhorse' end diff --git a/spec/tasks/gitlab/x509/update_rake_spec.rb b/spec/tasks/gitlab/x509/update_rake_spec.rb index 8c62c6c1728..93e97ab38ad 100644 --- a/spec/tasks/gitlab/x509/update_rake_spec.rb +++ b/spec/tasks/gitlab/x509/update_rake_spec.rb @@ -2,7 +2,7 @@ require 'rake_helper' -describe 'gitlab:x509 namespace rake task' do +RSpec.describe 'gitlab:x509 namespace rake task' do before :all do Rake.application.rake_require 'tasks/gitlab/x509/update' end diff --git a/spec/tasks/migrate/schema_check_rake_spec.rb b/spec/tasks/migrate/schema_check_rake_spec.rb index 1097a43cd8a..aebb3a6551f 100644 --- a/spec/tasks/migrate/schema_check_rake_spec.rb +++ b/spec/tasks/migrate/schema_check_rake_spec.rb @@ -3,7 +3,7 @@ require 'spec_helper' require 'rake' -describe 'schema_version_check rake task' do +RSpec.describe 'schema_version_check rake task' do include StubENV before :all do diff --git a/spec/tasks/tokens_spec.rb b/spec/tasks/tokens_spec.rb index 9c69155056a..13fcd37b426 100644 --- a/spec/tasks/tokens_spec.rb +++ b/spec/tasks/tokens_spec.rb @@ -2,7 +2,7 @@ require 'rake_helper' -describe 'tokens rake tasks' do +RSpec.describe 'tokens rake tasks' do let!(:user) { create(:user) } before do diff --git a/spec/uploaders/attachment_uploader_spec.rb b/spec/uploaders/attachment_uploader_spec.rb index d5a92b9b317..05cffff1f1a 100644 --- a/spec/uploaders/attachment_uploader_spec.rb +++ b/spec/uploaders/attachment_uploader_spec.rb @@ -2,7 +2,7 @@ require 'spec_helper' -describe AttachmentUploader do +RSpec.describe AttachmentUploader do let(:note) { create(:note, :with_attachment) } let(:uploader) { note.attachment } let(:upload) { create(:upload, :attachment_upload, model: uploader.model) } diff --git a/spec/uploaders/avatar_uploader_spec.rb b/spec/uploaders/avatar_uploader_spec.rb index 142ee557afa..1fadd9425ef 100644 --- a/spec/uploaders/avatar_uploader_spec.rb +++ b/spec/uploaders/avatar_uploader_spec.rb @@ -2,7 +2,7 @@ require 'spec_helper' -describe AvatarUploader do +RSpec.describe AvatarUploader do let(:model) { build_stubbed(:user) } let(:uploader) { described_class.new(model, :avatar) } let(:upload) { create(:upload, model: model) } diff --git a/spec/uploaders/content_type_whitelist_spec.rb b/spec/uploaders/content_type_whitelist_spec.rb index 32d030cdfee..cf7463369ab 100644 --- a/spec/uploaders/content_type_whitelist_spec.rb +++ b/spec/uploaders/content_type_whitelist_spec.rb @@ -2,7 +2,7 @@ require 'spec_helper' -describe ContentTypeWhitelist do +RSpec.describe ContentTypeWhitelist do let_it_be(:model) { build_stubbed(:user) } let!(:uploader) do stub_const('DummyUploader', Class.new(CarrierWave::Uploader::Base)) diff --git a/spec/uploaders/design_management/design_v432x230_uploader_spec.rb b/spec/uploaders/design_management/design_v432x230_uploader_spec.rb index 8c62b6ad6a8..b3a106ef94b 100644 --- a/spec/uploaders/design_management/design_v432x230_uploader_spec.rb +++ b/spec/uploaders/design_management/design_v432x230_uploader_spec.rb @@ -2,7 +2,7 @@ require 'spec_helper' -describe DesignManagement::DesignV432x230Uploader do +RSpec.describe DesignManagement::DesignV432x230Uploader do include CarrierWave::Test::Matchers let(:model) { create(:design_action, :with_image_v432x230) } diff --git a/spec/uploaders/external_diff_uploader_spec.rb b/spec/uploaders/external_diff_uploader_spec.rb index ee11085d54e..ee23c1e36b7 100644 --- a/spec/uploaders/external_diff_uploader_spec.rb +++ b/spec/uploaders/external_diff_uploader_spec.rb @@ -2,7 +2,7 @@ require 'spec_helper' -describe ExternalDiffUploader do +RSpec.describe ExternalDiffUploader do let(:diff) { create(:merge_request).merge_request_diff } let(:path) { Gitlab.config.external_diffs.storage_path } diff --git a/spec/uploaders/favicon_uploader_spec.rb b/spec/uploaders/favicon_uploader_spec.rb index 0f5941b3f0a..6bff3ff8a14 100644 --- a/spec/uploaders/favicon_uploader_spec.rb +++ b/spec/uploaders/favicon_uploader_spec.rb @@ -2,7 +2,7 @@ require 'spec_helper' -describe FaviconUploader do +RSpec.describe FaviconUploader do let_it_be(:model) { build_stubbed(:user) } let_it_be(:uploader) { described_class.new(model, :favicon) } diff --git a/spec/uploaders/file_mover_spec.rb b/spec/uploaders/file_mover_spec.rb index 474515b537c..0f7496f17d5 100644 --- a/spec/uploaders/file_mover_spec.rb +++ b/spec/uploaders/file_mover_spec.rb @@ -2,7 +2,7 @@ require 'spec_helper' -describe FileMover do +RSpec.describe FileMover do include FileMoverHelpers let(:user) { create(:user) } diff --git a/spec/uploaders/file_uploader_spec.rb b/spec/uploaders/file_uploader_spec.rb index 629c84778b9..9f1d276d092 100644 --- a/spec/uploaders/file_uploader_spec.rb +++ b/spec/uploaders/file_uploader_spec.rb @@ -2,7 +2,7 @@ require 'spec_helper' -describe FileUploader do +RSpec.describe FileUploader do let(:group) { create(:group, name: 'awesome') } let(:project) { create(:project, :legacy_storage, namespace: group, name: 'project') } let(:uploader) { described_class.new(project, :avatar) } diff --git a/spec/uploaders/gitlab_uploader_spec.rb b/spec/uploaders/gitlab_uploader_spec.rb index 80efdb88585..72845b47a53 100644 --- a/spec/uploaders/gitlab_uploader_spec.rb +++ b/spec/uploaders/gitlab_uploader_spec.rb @@ -3,7 +3,7 @@ require 'spec_helper' require 'carrierwave/storage/fog' -describe GitlabUploader do +RSpec.describe GitlabUploader do let(:uploader_class) { Class.new(described_class) } subject { uploader_class.new(double) } diff --git a/spec/uploaders/import_export_uploader_spec.rb b/spec/uploaders/import_export_uploader_spec.rb index 33cab911f86..b1fdcf067c6 100644 --- a/spec/uploaders/import_export_uploader_spec.rb +++ b/spec/uploaders/import_export_uploader_spec.rb @@ -2,7 +2,7 @@ require 'spec_helper' -describe ImportExportUploader do +RSpec.describe ImportExportUploader do let(:model) { build_stubbed(:import_export_upload) } let(:upload) { create(:upload, model: model) } let(:import_export_upload) { ImportExportUpload.new } diff --git a/spec/uploaders/job_artifact_uploader_spec.rb b/spec/uploaders/job_artifact_uploader_spec.rb index a03cf3b9dea..9ccf216d1fc 100644 --- a/spec/uploaders/job_artifact_uploader_spec.rb +++ b/spec/uploaders/job_artifact_uploader_spec.rb @@ -2,7 +2,7 @@ require 'spec_helper' -describe JobArtifactUploader do +RSpec.describe JobArtifactUploader do let(:store) { described_class::Store::LOCAL } let(:job_artifact) { create(:ci_job_artifact, file_store: store) } let(:uploader) { described_class.new(job_artifact, :file) } diff --git a/spec/uploaders/lfs_object_uploader_spec.rb b/spec/uploaders/lfs_object_uploader_spec.rb index 1041e13d34f..d1a3fb243ac 100644 --- a/spec/uploaders/lfs_object_uploader_spec.rb +++ b/spec/uploaders/lfs_object_uploader_spec.rb @@ -2,7 +2,7 @@ require 'spec_helper' -describe LfsObjectUploader do +RSpec.describe LfsObjectUploader do let(:lfs_object) { create(:lfs_object, :with_file) } let(:uploader) { described_class.new(lfs_object, :file) } let(:path) { Gitlab.config.lfs.storage_path } diff --git a/spec/uploaders/namespace_file_uploader_spec.rb b/spec/uploaders/namespace_file_uploader_spec.rb index bc8d6a33e85..99bf4e130f2 100644 --- a/spec/uploaders/namespace_file_uploader_spec.rb +++ b/spec/uploaders/namespace_file_uploader_spec.rb @@ -2,7 +2,7 @@ require 'spec_helper' -describe NamespaceFileUploader do +RSpec.describe NamespaceFileUploader do let(:group) { build_stubbed(:group) } let(:uploader) { described_class.new(group) } let(:upload) { create(:upload, :namespace_upload, model: group) } diff --git a/spec/uploaders/object_storage_spec.rb b/spec/uploaders/object_storage_spec.rb index f42d581ece4..694aafe5ed5 100644 --- a/spec/uploaders/object_storage_spec.rb +++ b/spec/uploaders/object_storage_spec.rb @@ -18,7 +18,7 @@ class Implementation < GitlabUploader end end -describe ObjectStorage do +RSpec.describe ObjectStorage do let(:uploader_class) { Implementation } let(:object) { build_stubbed(:user) } let(:uploader) { uploader_class.new(object, :file) } diff --git a/spec/uploaders/personal_file_uploader_spec.rb b/spec/uploaders/personal_file_uploader_spec.rb index c211ec3607c..d2eae5d7a54 100644 --- a/spec/uploaders/personal_file_uploader_spec.rb +++ b/spec/uploaders/personal_file_uploader_spec.rb @@ -2,7 +2,7 @@ require 'spec_helper' -describe PersonalFileUploader do +RSpec.describe PersonalFileUploader do let(:model) { create(:personal_snippet) } let(:uploader) { described_class.new(model) } let(:upload) { create(:upload, :personal_snippet_upload) } diff --git a/spec/uploaders/records_uploads_spec.rb b/spec/uploaders/records_uploads_spec.rb index 1a3c416c74a..c1f5f962d77 100644 --- a/spec/uploaders/records_uploads_spec.rb +++ b/spec/uploaders/records_uploads_spec.rb @@ -2,7 +2,7 @@ require 'spec_helper' -describe RecordsUploads do +RSpec.describe RecordsUploads do let!(:uploader) do stub_const('RecordsUploadsExampleUploader', Class.new(GitlabUploader)) diff --git a/spec/uploaders/terraform/state_uploader_spec.rb b/spec/uploaders/terraform/state_uploader_spec.rb index cbcb6298eca..dadfdf6e93f 100644 --- a/spec/uploaders/terraform/state_uploader_spec.rb +++ b/spec/uploaders/terraform/state_uploader_spec.rb @@ -2,7 +2,7 @@ require 'spec_helper' -describe Terraform::StateUploader do +RSpec.describe Terraform::StateUploader do subject { terraform_state.file } let(:terraform_state) { create(:terraform_state, :with_file) } diff --git a/spec/uploaders/uploader_helper_spec.rb b/spec/uploaders/uploader_helper_spec.rb index 7bc6caf8224..e62e9b3c14b 100644 --- a/spec/uploaders/uploader_helper_spec.rb +++ b/spec/uploaders/uploader_helper_spec.rb @@ -2,7 +2,7 @@ require 'spec_helper' -describe UploaderHelper do +RSpec.describe UploaderHelper do let(:uploader) do example_uploader = Class.new(CarrierWave::Uploader::Base) do include UploaderHelper diff --git a/spec/uploaders/workers/object_storage/background_move_worker_spec.rb b/spec/uploaders/workers/object_storage/background_move_worker_spec.rb index 38b70d33993..a481939ed7a 100644 --- a/spec/uploaders/workers/object_storage/background_move_worker_spec.rb +++ b/spec/uploaders/workers/object_storage/background_move_worker_spec.rb @@ -2,7 +2,7 @@ require 'spec_helper' -describe ObjectStorage::BackgroundMoveWorker do +RSpec.describe ObjectStorage::BackgroundMoveWorker do let(:local) { ObjectStorage::Store::LOCAL } let(:remote) { ObjectStorage::Store::REMOTE } diff --git a/spec/uploaders/workers/object_storage/migrate_uploads_worker_spec.rb b/spec/uploaders/workers/object_storage/migrate_uploads_worker_spec.rb index 7bf8512a6fd..ef5459ce788 100644 --- a/spec/uploaders/workers/object_storage/migrate_uploads_worker_spec.rb +++ b/spec/uploaders/workers/object_storage/migrate_uploads_worker_spec.rb @@ -2,7 +2,7 @@ require 'spec_helper' -describe ObjectStorage::MigrateUploadsWorker do +RSpec.describe ObjectStorage::MigrateUploadsWorker do let(:model_class) { Project } let(:uploads) { Upload.all } let(:to_store) { ObjectStorage::Store::REMOTE } diff --git a/spec/validators/addressable_url_validator_spec.rb b/spec/validators/addressable_url_validator_spec.rb index 46b1bebb074..394ffc7bbea 100644 --- a/spec/validators/addressable_url_validator_spec.rb +++ b/spec/validators/addressable_url_validator_spec.rb @@ -2,7 +2,7 @@ require 'spec_helper' -describe AddressableUrlValidator do +RSpec.describe AddressableUrlValidator do let!(:badge) { build(:badge, link_url: 'http://www.example.com') } let(:validator) { described_class.new(validator_options.reverse_merge(attributes: [:link_url])) } diff --git a/spec/validators/branch_filter_validator_spec.rb b/spec/validators/branch_filter_validator_spec.rb index 957d1dd99bb..2d869fa674d 100644 --- a/spec/validators/branch_filter_validator_spec.rb +++ b/spec/validators/branch_filter_validator_spec.rb @@ -2,7 +2,7 @@ require 'spec_helper' -describe BranchFilterValidator do +RSpec.describe BranchFilterValidator do let(:validator) { described_class.new(attributes: [:push_events_branch_filter]) } let(:hook) { build(:project_hook) } diff --git a/spec/validators/color_validator_spec.rb b/spec/validators/color_validator_spec.rb index e5a38ac9372..bd77b3df182 100644 --- a/spec/validators/color_validator_spec.rb +++ b/spec/validators/color_validator_spec.rb @@ -2,7 +2,7 @@ require 'spec_helper' -describe ColorValidator do +RSpec.describe ColorValidator do using RSpec::Parameterized::TableSyntax subject do diff --git a/spec/validators/cron_freeze_period_timezone_validator_spec.rb b/spec/validators/cron_freeze_period_timezone_validator_spec.rb index d283b89fa54..ee2541eb858 100644 --- a/spec/validators/cron_freeze_period_timezone_validator_spec.rb +++ b/spec/validators/cron_freeze_period_timezone_validator_spec.rb @@ -2,7 +2,7 @@ require 'spec_helper' -describe CronFreezePeriodTimezoneValidator do +RSpec.describe CronFreezePeriodTimezoneValidator do using RSpec::Parameterized::TableSyntax subject { create :ci_freeze_period } diff --git a/spec/validators/cron_validator_spec.rb b/spec/validators/cron_validator_spec.rb index d6605610402..dff3b506b89 100644 --- a/spec/validators/cron_validator_spec.rb +++ b/spec/validators/cron_validator_spec.rb @@ -2,7 +2,7 @@ require 'spec_helper' -describe CronValidator do +RSpec.describe CronValidator do subject do Class.new do include ActiveModel::Model diff --git a/spec/validators/devise_email_validator_spec.rb b/spec/validators/devise_email_validator_spec.rb index 1dbf3f66cfd..29a008f858a 100644 --- a/spec/validators/devise_email_validator_spec.rb +++ b/spec/validators/devise_email_validator_spec.rb @@ -2,7 +2,7 @@ require 'spec_helper' -describe DeviseEmailValidator do +RSpec.describe DeviseEmailValidator do let!(:user) { build(:user, public_email: 'test@example.com') } subject { validator.validate(user) } diff --git a/spec/validators/js_regex_validator_spec.rb b/spec/validators/js_regex_validator_spec.rb index dcc5e7ed4e8..d34ab78b44f 100644 --- a/spec/validators/js_regex_validator_spec.rb +++ b/spec/validators/js_regex_validator_spec.rb @@ -2,7 +2,7 @@ require 'spec_helper' -describe JsRegexValidator do +RSpec.describe JsRegexValidator do describe '#validates_each' do using RSpec::Parameterized::TableSyntax diff --git a/spec/validators/json_schema_validator_spec.rb b/spec/validators/json_schema_validator_spec.rb index 3e3a9c0e6a8..83eb0e2f3dd 100644 --- a/spec/validators/json_schema_validator_spec.rb +++ b/spec/validators/json_schema_validator_spec.rb @@ -2,7 +2,7 @@ require 'spec_helper' -describe JsonSchemaValidator do +RSpec.describe JsonSchemaValidator do describe '#validates_each' do let(:build_report_result) { build(:ci_build_report_result, :with_junit_success) } diff --git a/spec/validators/named_ecdsa_key_validator_spec.rb b/spec/validators/named_ecdsa_key_validator_spec.rb index 044c5b84a56..07326b7c55a 100644 --- a/spec/validators/named_ecdsa_key_validator_spec.rb +++ b/spec/validators/named_ecdsa_key_validator_spec.rb @@ -2,7 +2,7 @@ require 'spec_helper' -describe NamedEcdsaKeyValidator do +RSpec.describe NamedEcdsaKeyValidator do let(:validator) { described_class.new(attributes: [:key]) } let!(:domain) { build(:pages_domain) } diff --git a/spec/validators/namespace_path_validator_spec.rb b/spec/validators/namespace_path_validator_spec.rb index bc9834dbd2a..25940bba49a 100644 --- a/spec/validators/namespace_path_validator_spec.rb +++ b/spec/validators/namespace_path_validator_spec.rb @@ -2,7 +2,7 @@ require 'spec_helper' -describe NamespacePathValidator do +RSpec.describe NamespacePathValidator do let(:validator) { described_class.new(attributes: [:path]) } describe '.valid_path?' do diff --git a/spec/validators/project_path_validator_spec.rb b/spec/validators/project_path_validator_spec.rb index d6046f7214b..b92eb9106f6 100644 --- a/spec/validators/project_path_validator_spec.rb +++ b/spec/validators/project_path_validator_spec.rb @@ -2,7 +2,7 @@ require 'spec_helper' -describe ProjectPathValidator do +RSpec.describe ProjectPathValidator do let(:validator) { described_class.new(attributes: [:path]) } describe '.valid_path?' do diff --git a/spec/validators/public_url_validator_spec.rb b/spec/validators/public_url_validator_spec.rb index c81232d9b78..4fa6ad0cd6f 100644 --- a/spec/validators/public_url_validator_spec.rb +++ b/spec/validators/public_url_validator_spec.rb @@ -2,7 +2,7 @@ require 'spec_helper' -describe PublicUrlValidator do +RSpec.describe PublicUrlValidator do include_examples 'url validator examples', AddressableUrlValidator::DEFAULT_OPTIONS[:schemes] include_examples 'public url validator examples', allow_local_requests_from_web_hooks_and_services: true end diff --git a/spec/validators/qualified_domain_array_validator_spec.rb b/spec/validators/qualified_domain_array_validator_spec.rb index 664048c7544..788e007970a 100644 --- a/spec/validators/qualified_domain_array_validator_spec.rb +++ b/spec/validators/qualified_domain_array_validator_spec.rb @@ -2,7 +2,7 @@ require 'spec_helper' -describe QualifiedDomainArrayValidator do +RSpec.describe QualifiedDomainArrayValidator do let(:qualified_domain_array_validator_test_class) do Class.new do include ActiveModel::Validations diff --git a/spec/validators/sha_validator_spec.rb b/spec/validators/sha_validator_spec.rb index 0a76570f65e..cf2c7a72883 100644 --- a/spec/validators/sha_validator_spec.rb +++ b/spec/validators/sha_validator_spec.rb @@ -2,7 +2,7 @@ require 'spec_helper' -describe ShaValidator do +RSpec.describe ShaValidator do let(:validator) { described_class.new(attributes: [:base_commit_sha]) } let!(:merge_diff) { build(:merge_request_diff) } diff --git a/spec/validators/system_hook_url_validator_spec.rb b/spec/validators/system_hook_url_validator_spec.rb index 02384bbd1ce..445c0c7f67a 100644 --- a/spec/validators/system_hook_url_validator_spec.rb +++ b/spec/validators/system_hook_url_validator_spec.rb @@ -2,7 +2,7 @@ require 'spec_helper' -describe SystemHookUrlValidator do +RSpec.describe SystemHookUrlValidator do include_examples 'url validator examples', AddressableUrlValidator::DEFAULT_OPTIONS[:schemes] include_examples 'public url validator examples', allow_local_requests_from_system_hooks: true end diff --git a/spec/validators/variable_duplicates_validator_spec.rb b/spec/validators/variable_duplicates_validator_spec.rb index f48ebee7e0e..acc47ff225f 100644 --- a/spec/validators/variable_duplicates_validator_spec.rb +++ b/spec/validators/variable_duplicates_validator_spec.rb @@ -2,7 +2,7 @@ require 'spec_helper' -describe VariableDuplicatesValidator do +RSpec.describe VariableDuplicatesValidator do let(:validator) { described_class.new(attributes: [:variables], **options) } describe '#validate_each' do diff --git a/spec/validators/x509_certificate_credentials_validator_spec.rb b/spec/validators/x509_certificate_credentials_validator_spec.rb index 2a5a322622f..9baa31c7257 100644 --- a/spec/validators/x509_certificate_credentials_validator_spec.rb +++ b/spec/validators/x509_certificate_credentials_validator_spec.rb @@ -2,7 +2,7 @@ require 'spec_helper' -describe X509CertificateCredentialsValidator do +RSpec.describe X509CertificateCredentialsValidator do let(:certificate_data) { File.read('spec/fixtures/x509_certificate.crt') } let(:pkey_data) { File.read('spec/fixtures/x509_certificate_pk.key') } diff --git a/spec/views/admin/application_settings/_eks.html.haml_spec.rb b/spec/views/admin/application_settings/_eks.html.haml_spec.rb index 52434557d3a..2f45eaadc9f 100644 --- a/spec/views/admin/application_settings/_eks.html.haml_spec.rb +++ b/spec/views/admin/application_settings/_eks.html.haml_spec.rb @@ -2,7 +2,7 @@ require 'spec_helper' -describe 'admin/application_settings/_eks' do +RSpec.describe 'admin/application_settings/_eks' do let_it_be(:admin) { create(:admin) } let(:page) { Capybara::Node::Simple.new(rendered) } diff --git a/spec/views/admin/application_settings/_repository_storage.html.haml_spec.rb b/spec/views/admin/application_settings/_repository_storage.html.haml_spec.rb index 63236dbb0c4..2915fe1964f 100644 --- a/spec/views/admin/application_settings/_repository_storage.html.haml_spec.rb +++ b/spec/views/admin/application_settings/_repository_storage.html.haml_spec.rb @@ -2,7 +2,7 @@ require 'spec_helper' -describe 'admin/application_settings/_repository_storage.html.haml' do +RSpec.describe 'admin/application_settings/_repository_storage.html.haml' do let(:app_settings) { create(:application_setting) } let(:repository_storages_weighted_attributes) { [:repository_storages_weighted_default, :repository_storages_weighted_mepmep, :repository_storages_weighted_foobar]} let(:repository_storages_weighted) do diff --git a/spec/views/admin/application_settings/general.html.haml_spec.rb b/spec/views/admin/application_settings/general.html.haml_spec.rb index d8ca5dd1b49..5343847d755 100644 --- a/spec/views/admin/application_settings/general.html.haml_spec.rb +++ b/spec/views/admin/application_settings/general.html.haml_spec.rb @@ -2,7 +2,7 @@ require 'spec_helper' -describe 'admin/application_settings/general.html.haml' do +RSpec.describe 'admin/application_settings/general.html.haml' do let(:app_settings) { build(:application_setting) } let(:user) { create(:admin) } diff --git a/spec/views/admin/dashboard/index.html.haml_spec.rb b/spec/views/admin/dashboard/index.html.haml_spec.rb index 93fedde6e96..569a20e8f08 100644 --- a/spec/views/admin/dashboard/index.html.haml_spec.rb +++ b/spec/views/admin/dashboard/index.html.haml_spec.rb @@ -2,7 +2,7 @@ require 'spec_helper' -describe 'admin/dashboard/index.html.haml' do +RSpec.describe 'admin/dashboard/index.html.haml' do include Devise::Test::ControllerHelpers before do diff --git a/spec/views/admin/sessions/new.html.haml_spec.rb b/spec/views/admin/sessions/new.html.haml_spec.rb index b52ad0f9505..94870f0bdba 100644 --- a/spec/views/admin/sessions/new.html.haml_spec.rb +++ b/spec/views/admin/sessions/new.html.haml_spec.rb @@ -2,7 +2,7 @@ require 'spec_helper' -describe 'admin/sessions/new.html.haml' do +RSpec.describe 'admin/sessions/new.html.haml' do let(:user) { create(:admin) } before do diff --git a/spec/views/admin/sessions/two_factor.html.haml_spec.rb b/spec/views/admin/sessions/two_factor.html.haml_spec.rb index 2c061c7707b..9c5ff9925c1 100644 --- a/spec/views/admin/sessions/two_factor.html.haml_spec.rb +++ b/spec/views/admin/sessions/two_factor.html.haml_spec.rb @@ -2,7 +2,7 @@ require 'spec_helper' -describe 'admin/sessions/two_factor.html.haml' do +RSpec.describe 'admin/sessions/two_factor.html.haml' do before do allow(view).to receive(:current_user).and_return(user) end diff --git a/spec/views/admin/users/_user.html.haml_spec.rb b/spec/views/admin/users/_user.html.haml_spec.rb index de5a291a6f8..aed05e4ea9b 100644 --- a/spec/views/admin/users/_user.html.haml_spec.rb +++ b/spec/views/admin/users/_user.html.haml_spec.rb @@ -2,7 +2,7 @@ require 'spec_helper' -describe 'admin/users/_user.html.haml' do +RSpec.describe 'admin/users/_user.html.haml' do before do allow(view).to receive(:user).and_return(user) end diff --git a/spec/views/ci/status/_badge.html.haml_spec.rb b/spec/views/ci/status/_badge.html.haml_spec.rb index 59db828a0c7..6cbd9a61e98 100644 --- a/spec/views/ci/status/_badge.html.haml_spec.rb +++ b/spec/views/ci/status/_badge.html.haml_spec.rb @@ -2,7 +2,7 @@ require 'spec_helper' -describe 'ci/status/_badge' do +RSpec.describe 'ci/status/_badge' do let(:user) { create(:user) } let(:project) { create(:project, :private) } let(:pipeline) { create(:ci_pipeline, project: project) } diff --git a/spec/views/ci/status/_icon.html.haml_spec.rb b/spec/views/ci/status/_icon.html.haml_spec.rb index 626159fc512..d0579734451 100644 --- a/spec/views/ci/status/_icon.html.haml_spec.rb +++ b/spec/views/ci/status/_icon.html.haml_spec.rb @@ -1,7 +1,7 @@ # frozen_string_literal: true require 'spec_helper' -describe 'ci/status/_icon' do +RSpec.describe 'ci/status/_icon' do let(:user) { create(:user) } let(:project) { create(:project, :private) } let(:pipeline) { create(:ci_pipeline, project: project) } diff --git a/spec/views/dashboard/projects/_blank_state_admin_welcome.haml_spec.rb b/spec/views/dashboard/projects/_blank_state_admin_welcome.haml_spec.rb index bc92278bb22..9c064596f09 100644 --- a/spec/views/dashboard/projects/_blank_state_admin_welcome.haml_spec.rb +++ b/spec/views/dashboard/projects/_blank_state_admin_welcome.haml_spec.rb @@ -2,7 +2,7 @@ require 'spec_helper' -describe 'dashboard/projects/_blank_state_admin_welcome.html.haml' do +RSpec.describe 'dashboard/projects/_blank_state_admin_welcome.html.haml' do let(:user) { create(:admin) } before do diff --git a/spec/views/dashboard/projects/_nav.html.haml_spec.rb b/spec/views/dashboard/projects/_nav.html.haml_spec.rb index 61b6bfef120..a592c4e44d2 100644 --- a/spec/views/dashboard/projects/_nav.html.haml_spec.rb +++ b/spec/views/dashboard/projects/_nav.html.haml_spec.rb @@ -2,7 +2,7 @@ require 'spec_helper' -describe 'dashboard/projects/_nav.html.haml' do +RSpec.describe 'dashboard/projects/_nav.html.haml' do it 'highlights All tab by default' do render diff --git a/spec/views/devise/sessions/new.html.haml_spec.rb b/spec/views/devise/sessions/new.html.haml_spec.rb index 27bd683bbf0..b5c69f4f04d 100644 --- a/spec/views/devise/sessions/new.html.haml_spec.rb +++ b/spec/views/devise/sessions/new.html.haml_spec.rb @@ -2,7 +2,7 @@ require 'spec_helper' -describe 'devise/sessions/new' do +RSpec.describe 'devise/sessions/new' do describe 'ldap' do include LdapHelpers diff --git a/spec/views/devise/shared/_signin_box.html.haml_spec.rb b/spec/views/devise/shared/_signin_box.html.haml_spec.rb index dfd8c315e50..8b1af1866dc 100644 --- a/spec/views/devise/shared/_signin_box.html.haml_spec.rb +++ b/spec/views/devise/shared/_signin_box.html.haml_spec.rb @@ -2,7 +2,7 @@ require 'spec_helper' -describe 'devise/shared/_signin_box' do +RSpec.describe 'devise/shared/_signin_box' do describe 'Crowd form' do before do stub_devise diff --git a/spec/views/errors/access_denied.html.haml_spec.rb b/spec/views/errors/access_denied.html.haml_spec.rb index b2e82847ab9..276d94111c6 100644 --- a/spec/views/errors/access_denied.html.haml_spec.rb +++ b/spec/views/errors/access_denied.html.haml_spec.rb @@ -2,7 +2,7 @@ require 'spec_helper' -describe 'errors/access_denied' do +RSpec.describe 'errors/access_denied' do it 'does not fail to render when there is no message provided' do expect { render }.not_to raise_error end diff --git a/spec/views/events/event/_push.html.haml_spec.rb b/spec/views/events/event/_push.html.haml_spec.rb index d33a8aa86fc..f4d3258ff67 100644 --- a/spec/views/events/event/_push.html.haml_spec.rb +++ b/spec/views/events/event/_push.html.haml_spec.rb @@ -2,7 +2,7 @@ require 'spec_helper' -describe 'events/event/_push.html.haml' do +RSpec.describe 'events/event/_push.html.haml' do let(:event) { build_stubbed(:push_event) } context 'with a branch' do diff --git a/spec/views/groups/_home_panel.html.haml_spec.rb b/spec/views/groups/_home_panel.html.haml_spec.rb index 8960dfa67db..b8168b20450 100644 --- a/spec/views/groups/_home_panel.html.haml_spec.rb +++ b/spec/views/groups/_home_panel.html.haml_spec.rb @@ -2,7 +2,7 @@ require 'spec_helper' -describe 'groups/_home_panel' do +RSpec.describe 'groups/_home_panel' do let(:group) { create(:group) } before do diff --git a/spec/views/groups/edit.html.haml_spec.rb b/spec/views/groups/edit.html.haml_spec.rb index 9fc850841ee..83623ea7bb4 100644 --- a/spec/views/groups/edit.html.haml_spec.rb +++ b/spec/views/groups/edit.html.haml_spec.rb @@ -2,7 +2,7 @@ require 'spec_helper' -describe 'groups/edit.html.haml' do +RSpec.describe 'groups/edit.html.haml' do include Devise::Test::ControllerHelpers describe '"Share with group lock" setting' do diff --git a/spec/views/help/index.html.haml_spec.rb b/spec/views/help/index.html.haml_spec.rb index 3831ddacb72..c59790a346e 100644 --- a/spec/views/help/index.html.haml_spec.rb +++ b/spec/views/help/index.html.haml_spec.rb @@ -2,7 +2,7 @@ require 'spec_helper' -describe 'help/index' do +RSpec.describe 'help/index' do include StubVersion describe 'version information' do diff --git a/spec/views/help/instance_configuration.html.haml_spec.rb b/spec/views/help/instance_configuration.html.haml_spec.rb index 81d569b5cf4..7b431bb4180 100644 --- a/spec/views/help/instance_configuration.html.haml_spec.rb +++ b/spec/views/help/instance_configuration.html.haml_spec.rb @@ -2,7 +2,7 @@ require 'spec_helper' -describe 'help/instance_configuration' do +RSpec.describe 'help/instance_configuration' do describe 'General Sections:' do let(:instance_configuration) { build(:instance_configuration)} let(:settings) { instance_configuration.settings } diff --git a/spec/views/help/show.html.haml_spec.rb b/spec/views/help/show.html.haml_spec.rb index 539c647c1d3..ab303919673 100644 --- a/spec/views/help/show.html.haml_spec.rb +++ b/spec/views/help/show.html.haml_spec.rb @@ -2,7 +2,7 @@ require 'spec_helper' -describe 'help/show' do +RSpec.describe 'help/show' do describe 'Markdown rendering' do before do assign(:path, 'ssh/README') diff --git a/spec/views/import/gitlab_projects/new.html.haml_spec.rb b/spec/views/import/gitlab_projects/new.html.haml_spec.rb index 17636c99cbc..c09c798f487 100644 --- a/spec/views/import/gitlab_projects/new.html.haml_spec.rb +++ b/spec/views/import/gitlab_projects/new.html.haml_spec.rb @@ -2,7 +2,7 @@ require 'spec_helper' -describe 'import/gitlab_projects/new.html.haml' do +RSpec.describe 'import/gitlab_projects/new.html.haml' do include Devise::Test::ControllerHelpers let(:namespace) { build_stubbed(:namespace) } diff --git a/spec/views/layouts/_head.html.haml_spec.rb b/spec/views/layouts/_head.html.haml_spec.rb index 7011fa23327..25fcbeb61df 100644 --- a/spec/views/layouts/_head.html.haml_spec.rb +++ b/spec/views/layouts/_head.html.haml_spec.rb @@ -2,7 +2,7 @@ require 'spec_helper' -describe 'layouts/_head' do +RSpec.describe 'layouts/_head' do include StubConfiguration before do diff --git a/spec/views/layouts/application.html.haml_spec.rb b/spec/views/layouts/application.html.haml_spec.rb index 4270bbf1924..679d0b1ff60 100644 --- a/spec/views/layouts/application.html.haml_spec.rb +++ b/spec/views/layouts/application.html.haml_spec.rb @@ -2,7 +2,7 @@ require 'spec_helper' -describe 'layouts/application' do +RSpec.describe 'layouts/application' do let(:user) { create(:user) } before do diff --git a/spec/views/layouts/header/_new_dropdown.haml_spec.rb b/spec/views/layouts/header/_new_dropdown.haml_spec.rb index 1a04ffed103..cf33ec9884b 100644 --- a/spec/views/layouts/header/_new_dropdown.haml_spec.rb +++ b/spec/views/layouts/header/_new_dropdown.haml_spec.rb @@ -2,7 +2,7 @@ require 'spec_helper' -describe 'layouts/header/_new_dropdown' do +RSpec.describe 'layouts/header/_new_dropdown' do let(:user) { create(:user) } context 'group-specific links' do diff --git a/spec/views/layouts/nav/sidebar/_admin.html.haml_spec.rb b/spec/views/layouts/nav/sidebar/_admin.html.haml_spec.rb index 2f8a75a81c8..d1e756422d5 100644 --- a/spec/views/layouts/nav/sidebar/_admin.html.haml_spec.rb +++ b/spec/views/layouts/nav/sidebar/_admin.html.haml_spec.rb @@ -2,7 +2,7 @@ require 'spec_helper' -describe 'layouts/nav/sidebar/_admin' do +RSpec.describe 'layouts/nav/sidebar/_admin' do shared_examples 'page has active tab' do |title| it "activates #{title} tab" do render diff --git a/spec/views/layouts/nav/sidebar/_group.html.haml_spec.rb b/spec/views/layouts/nav/sidebar/_group.html.haml_spec.rb index 24b66a0e767..b3c8450fb48 100644 --- a/spec/views/layouts/nav/sidebar/_group.html.haml_spec.rb +++ b/spec/views/layouts/nav/sidebar/_group.html.haml_spec.rb @@ -2,7 +2,7 @@ require 'spec_helper' -describe 'layouts/nav/sidebar/_group' do +RSpec.describe 'layouts/nav/sidebar/_group' do let(:group) { create(:group) } before do diff --git a/spec/views/layouts/nav/sidebar/_instance_statistics.html.haml_spec.rb b/spec/views/layouts/nav/sidebar/_instance_statistics.html.haml_spec.rb index 7f7f5637035..d3b57f6dfcf 100644 --- a/spec/views/layouts/nav/sidebar/_instance_statistics.html.haml_spec.rb +++ b/spec/views/layouts/nav/sidebar/_instance_statistics.html.haml_spec.rb @@ -2,6 +2,6 @@ require 'spec_helper' -describe 'layouts/nav/sidebar/_instance_statistics' do +RSpec.describe 'layouts/nav/sidebar/_instance_statistics' do it_behaves_like 'has nav sidebar' end diff --git a/spec/views/layouts/nav/sidebar/_profile.html.haml_spec.rb b/spec/views/layouts/nav/sidebar/_profile.html.haml_spec.rb index 6b820ab0b4c..0f6dcf8e57f 100644 --- a/spec/views/layouts/nav/sidebar/_profile.html.haml_spec.rb +++ b/spec/views/layouts/nav/sidebar/_profile.html.haml_spec.rb @@ -2,7 +2,7 @@ require 'spec_helper' -describe 'layouts/nav/sidebar/_profile' do +RSpec.describe 'layouts/nav/sidebar/_profile' do let(:user) { create(:user) } before do diff --git a/spec/views/layouts/nav/sidebar/_project.html.haml_spec.rb b/spec/views/layouts/nav/sidebar/_project.html.haml_spec.rb index 881ea818cb0..5cf7baa1dd0 100644 --- a/spec/views/layouts/nav/sidebar/_project.html.haml_spec.rb +++ b/spec/views/layouts/nav/sidebar/_project.html.haml_spec.rb @@ -2,7 +2,7 @@ require 'spec_helper' -describe 'layouts/nav/sidebar/_project' do +RSpec.describe 'layouts/nav/sidebar/_project' do let(:project) { create(:project, :repository) } before do diff --git a/spec/views/notify/changed_milestone_email.html.haml_spec.rb b/spec/views/notify/changed_milestone_email.html.haml_spec.rb index 194b58840a3..50a06683409 100644 --- a/spec/views/notify/changed_milestone_email.html.haml_spec.rb +++ b/spec/views/notify/changed_milestone_email.html.haml_spec.rb @@ -2,7 +2,7 @@ require 'spec_helper' -describe 'notify/changed_milestone_email.html.haml' do +RSpec.describe 'notify/changed_milestone_email.html.haml' do let(:milestone) { create(:milestone, title: 'some-milestone') } let(:milestone_link) { milestone_url(milestone) } diff --git a/spec/views/notify/pipeline_failed_email.html.haml_spec.rb b/spec/views/notify/pipeline_failed_email.html.haml_spec.rb index 80dc14b523d..b41933f9c36 100644 --- a/spec/views/notify/pipeline_failed_email.html.haml_spec.rb +++ b/spec/views/notify/pipeline_failed_email.html.haml_spec.rb @@ -2,7 +2,7 @@ require 'spec_helper' -describe 'notify/pipeline_failed_email.html.haml' do +RSpec.describe 'notify/pipeline_failed_email.html.haml' do it_behaves_like 'pipeline status changes email' do let(:title) { 'Your pipeline has failed' } let(:status) { :failed } diff --git a/spec/views/notify/pipeline_failed_email.text.erb_spec.rb b/spec/views/notify/pipeline_failed_email.text.erb_spec.rb index 9a4cea408a6..a5c31632b0d 100644 --- a/spec/views/notify/pipeline_failed_email.text.erb_spec.rb +++ b/spec/views/notify/pipeline_failed_email.text.erb_spec.rb @@ -1,7 +1,7 @@ # frozen_string_literal: true require 'spec_helper' -describe 'notify/pipeline_failed_email.text.erb' do +RSpec.describe 'notify/pipeline_failed_email.text.erb' do include Devise::Test::ControllerHelpers let(:user) { create(:user, developer_projects: [project]) } diff --git a/spec/views/notify/pipeline_fixed_email.html.haml_spec.rb b/spec/views/notify/pipeline_fixed_email.html.haml_spec.rb index 382fc5ecdd3..2b3b08f8e8c 100644 --- a/spec/views/notify/pipeline_fixed_email.html.haml_spec.rb +++ b/spec/views/notify/pipeline_fixed_email.html.haml_spec.rb @@ -2,7 +2,7 @@ require 'spec_helper' -describe 'notify/pipeline_fixed_email.html.haml' do +RSpec.describe 'notify/pipeline_fixed_email.html.haml' do it_behaves_like 'pipeline status changes email' do let(:title) { 'Your pipeline has been fixed!' } let(:status) { :success } diff --git a/spec/views/notify/pipeline_fixed_email.text.erb_spec.rb b/spec/views/notify/pipeline_fixed_email.text.erb_spec.rb index ec540dc3f77..8640998acaa 100644 --- a/spec/views/notify/pipeline_fixed_email.text.erb_spec.rb +++ b/spec/views/notify/pipeline_fixed_email.text.erb_spec.rb @@ -2,7 +2,7 @@ require 'spec_helper' -describe 'notify/pipeline_fixed_email.text.erb' do +RSpec.describe 'notify/pipeline_fixed_email.text.erb' do it_behaves_like 'pipeline status changes email' do let(:title) { 'Your pipeline has been fixed!' } let(:status) { :success } diff --git a/spec/views/notify/pipeline_success_email.html.haml_spec.rb b/spec/views/notify/pipeline_success_email.html.haml_spec.rb index 417909fd67b..51ea7ef5066 100644 --- a/spec/views/notify/pipeline_success_email.html.haml_spec.rb +++ b/spec/views/notify/pipeline_success_email.html.haml_spec.rb @@ -2,7 +2,7 @@ require 'spec_helper' -describe 'notify/pipeline_success_email.html.haml' do +RSpec.describe 'notify/pipeline_success_email.html.haml' do it_behaves_like 'pipeline status changes email' do let(:title) { 'Your pipeline has passed' } let(:status) { :success } diff --git a/spec/views/notify/pipeline_success_email.text.erb_spec.rb b/spec/views/notify/pipeline_success_email.text.erb_spec.rb index 4a914cab85e..3acf4dd3e26 100644 --- a/spec/views/notify/pipeline_success_email.text.erb_spec.rb +++ b/spec/views/notify/pipeline_success_email.text.erb_spec.rb @@ -2,7 +2,7 @@ require 'spec_helper' -describe 'notify/pipeline_success_email.text.erb' do +RSpec.describe 'notify/pipeline_success_email.text.erb' do it_behaves_like 'pipeline status changes email' do let(:title) { 'Your pipeline has passed' } let(:status) { :success } diff --git a/spec/views/profiles/preferences/show.html.haml_spec.rb b/spec/views/profiles/preferences/show.html.haml_spec.rb index 2e50e329cfd..5acfbfb9db1 100644 --- a/spec/views/profiles/preferences/show.html.haml_spec.rb +++ b/spec/views/profiles/preferences/show.html.haml_spec.rb @@ -2,7 +2,7 @@ require 'spec_helper' -describe 'profiles/preferences/show' do +RSpec.describe 'profiles/preferences/show' do using RSpec::Parameterized::TableSyntax let_it_be(:user) { build(:user) } diff --git a/spec/views/profiles/show.html.haml_spec.rb b/spec/views/profiles/show.html.haml_spec.rb index 14e6feed3ab..daa1d20e6b1 100644 --- a/spec/views/profiles/show.html.haml_spec.rb +++ b/spec/views/profiles/show.html.haml_spec.rb @@ -2,7 +2,7 @@ require 'spec_helper' -describe 'profiles/show' do +RSpec.describe 'profiles/show' do let(:user) { create(:user) } before do diff --git a/spec/views/projects/_home_panel.html.haml_spec.rb b/spec/views/projects/_home_panel.html.haml_spec.rb index 9956144b601..548dba7874a 100644 --- a/spec/views/projects/_home_panel.html.haml_spec.rb +++ b/spec/views/projects/_home_panel.html.haml_spec.rb @@ -2,7 +2,7 @@ require 'spec_helper' -describe 'projects/_home_panel' do +RSpec.describe 'projects/_home_panel' do include ProjectForksHelper context 'notifications' do diff --git a/spec/views/projects/blob/_viewer.html.haml_spec.rb b/spec/views/projects/blob/_viewer.html.haml_spec.rb index a798a72fa76..893cfec1491 100644 --- a/spec/views/projects/blob/_viewer.html.haml_spec.rb +++ b/spec/views/projects/blob/_viewer.html.haml_spec.rb @@ -2,7 +2,7 @@ require 'spec_helper' -describe 'projects/blob/_viewer.html.haml' do +RSpec.describe 'projects/blob/_viewer.html.haml' do include FakeBlobHelpers let(:project) { build(:project) } diff --git a/spec/views/projects/buttons/_dropdown.html.haml_spec.rb b/spec/views/projects/buttons/_dropdown.html.haml_spec.rb index 2bc1de040d5..fc9d7c3ea91 100644 --- a/spec/views/projects/buttons/_dropdown.html.haml_spec.rb +++ b/spec/views/projects/buttons/_dropdown.html.haml_spec.rb @@ -2,7 +2,7 @@ require 'spec_helper' -describe 'projects/buttons/_dropdown' do +RSpec.describe 'projects/buttons/_dropdown' do let(:user) { create(:user) } context 'user with all abilities' do diff --git a/spec/views/projects/ci/lints/show.html.haml_spec.rb b/spec/views/projects/ci/lints/show.html.haml_spec.rb index 8c3cf04bae6..bcfb952ca66 100644 --- a/spec/views/projects/ci/lints/show.html.haml_spec.rb +++ b/spec/views/projects/ci/lints/show.html.haml_spec.rb @@ -2,7 +2,7 @@ require 'spec_helper' -describe 'projects/ci/lints/show' do +RSpec.describe 'projects/ci/lints/show' do include Devise::Test::ControllerHelpers let(:project) { create(:project, :repository) } let(:config_processor) { Gitlab::Ci::YamlProcessor.new(YAML.dump(content)) } diff --git a/spec/views/projects/clusters/clusters/gcp/_form.html.haml_spec.rb b/spec/views/projects/clusters/clusters/gcp/_form.html.haml_spec.rb index 1cb2f9a4301..bf5cb6fb25d 100644 --- a/spec/views/projects/clusters/clusters/gcp/_form.html.haml_spec.rb +++ b/spec/views/projects/clusters/clusters/gcp/_form.html.haml_spec.rb @@ -2,7 +2,7 @@ require 'spec_helper' -describe 'clusters/clusters/gcp/_form' do +RSpec.describe 'clusters/clusters/gcp/_form' do let(:admin) { create(:admin) } let(:environment) { create(:environment) } let(:gcp_cluster) { create(:cluster, :provided_by_gcp) } diff --git a/spec/views/projects/commit/_commit_box.html.haml_spec.rb b/spec/views/projects/commit/_commit_box.html.haml_spec.rb index 07c530670d2..9c97696493e 100644 --- a/spec/views/projects/commit/_commit_box.html.haml_spec.rb +++ b/spec/views/projects/commit/_commit_box.html.haml_spec.rb @@ -2,7 +2,7 @@ require 'spec_helper' -describe 'projects/commit/_commit_box.html.haml' do +RSpec.describe 'projects/commit/_commit_box.html.haml' do let(:user) { create(:user) } let(:project) { create(:project, :repository) } diff --git a/spec/views/projects/commit/branches.html.haml_spec.rb b/spec/views/projects/commit/branches.html.haml_spec.rb index 0fe7165a790..f1064be3047 100644 --- a/spec/views/projects/commit/branches.html.haml_spec.rb +++ b/spec/views/projects/commit/branches.html.haml_spec.rb @@ -2,7 +2,7 @@ require 'spec_helper' -describe 'projects/commit/branches.html.haml' do +RSpec.describe 'projects/commit/branches.html.haml' do let(:project) { create(:project, :repository) } before do diff --git a/spec/views/projects/commit/show.html.haml_spec.rb b/spec/views/projects/commit/show.html.haml_spec.rb index af28a8f9193..c2970abbe9f 100644 --- a/spec/views/projects/commit/show.html.haml_spec.rb +++ b/spec/views/projects/commit/show.html.haml_spec.rb @@ -2,7 +2,7 @@ require 'spec_helper' -describe 'projects/commit/show.html.haml' do +RSpec.describe 'projects/commit/show.html.haml' do let(:project) { create(:project, :repository) } let(:commit) { project.commit } diff --git a/spec/views/projects/commits/_commit.html.haml_spec.rb b/spec/views/projects/commits/_commit.html.haml_spec.rb index 1c01a7f9a9c..898d3baae19 100644 --- a/spec/views/projects/commits/_commit.html.haml_spec.rb +++ b/spec/views/projects/commits/_commit.html.haml_spec.rb @@ -2,7 +2,7 @@ require 'spec_helper' -describe 'projects/commits/_commit.html.haml' do +RSpec.describe 'projects/commits/_commit.html.haml' do let(:template) { 'projects/commits/commit.html.haml' } let(:project) { create(:project, :repository) } let(:commit) { project.repository.commit(ref) } diff --git a/spec/views/projects/deployments/_confirm_rollback_modal_spec.html_spec.rb b/spec/views/projects/deployments/_confirm_rollback_modal_spec.html_spec.rb index 9168bc8e833..2fb7b6187eb 100644 --- a/spec/views/projects/deployments/_confirm_rollback_modal_spec.html_spec.rb +++ b/spec/views/projects/deployments/_confirm_rollback_modal_spec.html_spec.rb @@ -2,7 +2,7 @@ require 'spec_helper' -describe 'projects/deployments/_confirm_rollback_modal' do +RSpec.describe 'projects/deployments/_confirm_rollback_modal' do let(:environment) { create(:environment, :with_review_app) } let(:deployments) { environment.deployments } let(:project) { environment.project } diff --git a/spec/views/projects/diffs/_stats.html.haml_spec.rb b/spec/views/projects/diffs/_stats.html.haml_spec.rb index eb853596f98..f0580b50349 100644 --- a/spec/views/projects/diffs/_stats.html.haml_spec.rb +++ b/spec/views/projects/diffs/_stats.html.haml_spec.rb @@ -2,7 +2,7 @@ require 'spec_helper' -describe 'projects/diffs/_stats.html.haml' do +RSpec.describe 'projects/diffs/_stats.html.haml' do let(:project) { create(:project, :repository) } let(:commit) { project.commit('570e7b2abdd848b95f2f578043fc23bd6f6fd24d') } diff --git a/spec/views/projects/diffs/_viewer.html.haml_spec.rb b/spec/views/projects/diffs/_viewer.html.haml_spec.rb index 27f271bb178..305c44190b4 100644 --- a/spec/views/projects/diffs/_viewer.html.haml_spec.rb +++ b/spec/views/projects/diffs/_viewer.html.haml_spec.rb @@ -2,7 +2,7 @@ require 'spec_helper' -describe 'projects/diffs/_viewer.html.haml' do +RSpec.describe 'projects/diffs/_viewer.html.haml' do include FakeBlobHelpers let(:project) { create(:project, :repository) } diff --git a/spec/views/projects/edit.html.haml_spec.rb b/spec/views/projects/edit.html.haml_spec.rb index 0c0f74a41f0..b44d07d2ee4 100644 --- a/spec/views/projects/edit.html.haml_spec.rb +++ b/spec/views/projects/edit.html.haml_spec.rb @@ -2,7 +2,7 @@ require 'spec_helper' -describe 'projects/edit' do +RSpec.describe 'projects/edit' do include Devise::Test::ControllerHelpers include ProjectForksHelper diff --git a/spec/views/projects/environments/terminal.html.haml_spec.rb b/spec/views/projects/environments/terminal.html.haml_spec.rb index b0b08a84f8d..bfb88f0f72b 100644 --- a/spec/views/projects/environments/terminal.html.haml_spec.rb +++ b/spec/views/projects/environments/terminal.html.haml_spec.rb @@ -2,7 +2,7 @@ require 'spec_helper' -describe 'projects/environments/terminal' do +RSpec.describe 'projects/environments/terminal' do let!(:environment) { create(:environment, :with_review_app) } before do diff --git a/spec/views/projects/imports/new.html.haml_spec.rb b/spec/views/projects/imports/new.html.haml_spec.rb index 6cca369b9f6..edf9eadf924 100644 --- a/spec/views/projects/imports/new.html.haml_spec.rb +++ b/spec/views/projects/imports/new.html.haml_spec.rb @@ -2,7 +2,7 @@ require "spec_helper" -describe "projects/imports/new.html.haml" do +RSpec.describe "projects/imports/new.html.haml" do let(:user) { create(:user) } context 'when import fails' do diff --git a/spec/views/projects/issues/_related_branches.html.haml_spec.rb b/spec/views/projects/issues/_related_branches.html.haml_spec.rb index 6c9bbaea38c..ba6f7068024 100644 --- a/spec/views/projects/issues/_related_branches.html.haml_spec.rb +++ b/spec/views/projects/issues/_related_branches.html.haml_spec.rb @@ -2,7 +2,7 @@ require 'spec_helper' -describe 'projects/issues/_related_branches' do +RSpec.describe 'projects/issues/_related_branches' do include Devise::Test::ControllerHelpers let(:pipeline) { build(:ci_pipeline, :success) } diff --git a/spec/views/projects/issues/show.html.haml_spec.rb b/spec/views/projects/issues/show.html.haml_spec.rb index 60a541916e9..59c6d126f41 100644 --- a/spec/views/projects/issues/show.html.haml_spec.rb +++ b/spec/views/projects/issues/show.html.haml_spec.rb @@ -2,7 +2,7 @@ require 'spec_helper' -describe 'projects/issues/show' do +RSpec.describe 'projects/issues/show' do include_context 'project show action' context 'when the issue is closed' do diff --git a/spec/views/projects/jobs/_build.html.haml_spec.rb b/spec/views/projects/jobs/_build.html.haml_spec.rb index 681df77ea99..4256df9ce9a 100644 --- a/spec/views/projects/jobs/_build.html.haml_spec.rb +++ b/spec/views/projects/jobs/_build.html.haml_spec.rb @@ -2,7 +2,7 @@ require 'spec_helper' -describe 'projects/ci/jobs/_build' do +RSpec.describe 'projects/ci/jobs/_build' do include Devise::Test::ControllerHelpers let(:project) { create(:project, :repository) } diff --git a/spec/views/projects/jobs/_generic_commit_status.html.haml_spec.rb b/spec/views/projects/jobs/_generic_commit_status.html.haml_spec.rb index f193ce0a552..9be2a6f0ce4 100644 --- a/spec/views/projects/jobs/_generic_commit_status.html.haml_spec.rb +++ b/spec/views/projects/jobs/_generic_commit_status.html.haml_spec.rb @@ -2,7 +2,7 @@ require 'spec_helper' -describe 'projects/generic_commit_statuses/_generic_commit_status.html.haml' do +RSpec.describe 'projects/generic_commit_statuses/_generic_commit_status.html.haml' do include Devise::Test::ControllerHelpers let(:project) { create(:project, :repository) } diff --git a/spec/views/projects/jobs/show.html.haml_spec.rb b/spec/views/projects/jobs/show.html.haml_spec.rb index 903a16d9e53..83a00135629 100644 --- a/spec/views/projects/jobs/show.html.haml_spec.rb +++ b/spec/views/projects/jobs/show.html.haml_spec.rb @@ -2,7 +2,7 @@ require 'spec_helper' -describe 'projects/jobs/show' do +RSpec.describe 'projects/jobs/show' do let(:user) { create(:user) } let(:project) { create(:project, :repository) } let(:build) { create(:ci_build, pipeline: pipeline) } diff --git a/spec/views/projects/merge_requests/_commits.html.haml_spec.rb b/spec/views/projects/merge_requests/_commits.html.haml_spec.rb index 755a40a7e4c..fd77c4eb372 100644 --- a/spec/views/projects/merge_requests/_commits.html.haml_spec.rb +++ b/spec/views/projects/merge_requests/_commits.html.haml_spec.rb @@ -2,7 +2,7 @@ require 'spec_helper' -describe 'projects/merge_requests/_commits.html.haml', :sidekiq_might_not_need_inline do +RSpec.describe 'projects/merge_requests/_commits.html.haml', :sidekiq_might_not_need_inline do include Devise::Test::ControllerHelpers include ProjectForksHelper diff --git a/spec/views/projects/merge_requests/creations/_new_submit.html.haml_spec.rb b/spec/views/projects/merge_requests/creations/_new_submit.html.haml_spec.rb index f7db4a4d614..038a94fe7c3 100644 --- a/spec/views/projects/merge_requests/creations/_new_submit.html.haml_spec.rb +++ b/spec/views/projects/merge_requests/creations/_new_submit.html.haml_spec.rb @@ -2,7 +2,7 @@ require 'spec_helper' -describe 'projects/merge_requests/creations/_new_submit.html.haml' do +RSpec.describe 'projects/merge_requests/creations/_new_submit.html.haml' do let(:merge_request) { create(:merge_request) } let!(:pipeline) { create(:ci_empty_pipeline) } diff --git a/spec/views/projects/merge_requests/diffs/_diffs.html.haml_spec.rb b/spec/views/projects/merge_requests/diffs/_diffs.html.haml_spec.rb index a82ef3c04b5..7cdc817d784 100644 --- a/spec/views/projects/merge_requests/diffs/_diffs.html.haml_spec.rb +++ b/spec/views/projects/merge_requests/diffs/_diffs.html.haml_spec.rb @@ -2,7 +2,7 @@ require 'spec_helper' -describe 'projects/merge_requests/diffs/_diffs.html.haml' do +RSpec.describe 'projects/merge_requests/diffs/_diffs.html.haml' do include Devise::Test::ControllerHelpers let(:user) { create(:user) } diff --git a/spec/views/projects/merge_requests/edit.html.haml_spec.rb b/spec/views/projects/merge_requests/edit.html.haml_spec.rb index 74d9067076c..55a74dc8229 100644 --- a/spec/views/projects/merge_requests/edit.html.haml_spec.rb +++ b/spec/views/projects/merge_requests/edit.html.haml_spec.rb @@ -2,7 +2,7 @@ require 'spec_helper' -describe 'projects/merge_requests/edit.html.haml' do +RSpec.describe 'projects/merge_requests/edit.html.haml' do include Devise::Test::ControllerHelpers include ProjectForksHelper diff --git a/spec/views/projects/merge_requests/show.html.haml_spec.rb b/spec/views/projects/merge_requests/show.html.haml_spec.rb index e0acf5d1507..32819fc2cb0 100644 --- a/spec/views/projects/merge_requests/show.html.haml_spec.rb +++ b/spec/views/projects/merge_requests/show.html.haml_spec.rb @@ -2,7 +2,7 @@ require 'spec_helper' -describe 'projects/merge_requests/show.html.haml' do +RSpec.describe 'projects/merge_requests/show.html.haml' do before do allow(view).to receive(:experiment_enabled?).and_return(false) end diff --git a/spec/views/projects/notes/_more_actions_dropdown.html.haml_spec.rb b/spec/views/projects/notes/_more_actions_dropdown.html.haml_spec.rb index a07523a4423..3776af9e757 100644 --- a/spec/views/projects/notes/_more_actions_dropdown.html.haml_spec.rb +++ b/spec/views/projects/notes/_more_actions_dropdown.html.haml_spec.rb @@ -2,7 +2,7 @@ require 'spec_helper' -describe 'projects/notes/_more_actions_dropdown' do +RSpec.describe 'projects/notes/_more_actions_dropdown' do let(:author_user) { create(:user) } let(:not_author_user) { create(:user) } diff --git a/spec/views/projects/pages/show.html.haml_spec.rb b/spec/views/projects/pages/show.html.haml_spec.rb index 63b66616f31..fac46d08f0c 100644 --- a/spec/views/projects/pages/show.html.haml_spec.rb +++ b/spec/views/projects/pages/show.html.haml_spec.rb @@ -2,7 +2,7 @@ require 'spec_helper' -describe 'projects/pages/show' do +RSpec.describe 'projects/pages/show' do include LetsEncryptHelpers let(:project) { create(:project, :repository) } diff --git a/spec/views/projects/pages_domains/show.html.haml_spec.rb b/spec/views/projects/pages_domains/show.html.haml_spec.rb index 2de82a63560..d2abe3dfa56 100644 --- a/spec/views/projects/pages_domains/show.html.haml_spec.rb +++ b/spec/views/projects/pages_domains/show.html.haml_spec.rb @@ -2,7 +2,7 @@ require 'spec_helper' -describe 'projects/pages_domains/show' do +RSpec.describe 'projects/pages_domains/show' do let(:project) { create(:project, :repository) } before do diff --git a/spec/views/projects/pipeline_schedules/_pipeline_schedule.html.haml_spec.rb b/spec/views/projects/pipeline_schedules/_pipeline_schedule.html.haml_spec.rb index daf799ec13f..e650e183bc8 100644 --- a/spec/views/projects/pipeline_schedules/_pipeline_schedule.html.haml_spec.rb +++ b/spec/views/projects/pipeline_schedules/_pipeline_schedule.html.haml_spec.rb @@ -2,7 +2,7 @@ require 'spec_helper' -describe 'projects/pipeline_schedules/_pipeline_schedule' do +RSpec.describe 'projects/pipeline_schedules/_pipeline_schedule' do let(:owner) { create(:user) } let(:maintainer) { create(:user) } let(:project) { create(:project) } diff --git a/spec/views/projects/pipelines/_stage.html.haml_spec.rb b/spec/views/projects/pipelines/_stage.html.haml_spec.rb index a1139b5c01a..c8f6784a0f6 100644 --- a/spec/views/projects/pipelines/_stage.html.haml_spec.rb +++ b/spec/views/projects/pipelines/_stage.html.haml_spec.rb @@ -2,7 +2,7 @@ require 'spec_helper' -describe 'projects/pipelines/_stage' do +RSpec.describe 'projects/pipelines/_stage' do let(:project) { create(:project, :repository) } let(:pipeline) { create(:ci_pipeline, project: project) } let(:stage) { build(:ci_stage, pipeline: pipeline) } diff --git a/spec/views/projects/services/_form.haml_spec.rb b/spec/views/projects/services/_form.haml_spec.rb index 720e0aaf450..f5c4e79a082 100644 --- a/spec/views/projects/services/_form.haml_spec.rb +++ b/spec/views/projects/services/_form.haml_spec.rb @@ -2,7 +2,7 @@ require 'spec_helper' -describe 'projects/services/_form' do +RSpec.describe 'projects/services/_form' do let(:project) { create(:redmine_project) } let(:user) { create(:admin) } diff --git a/spec/views/projects/services/edit.html.haml_spec.rb b/spec/views/projects/services/edit.html.haml_spec.rb index 12e1cda2c00..785af6a5344 100644 --- a/spec/views/projects/services/edit.html.haml_spec.rb +++ b/spec/views/projects/services/edit.html.haml_spec.rb @@ -2,7 +2,7 @@ require 'spec_helper' -describe 'projects/services/edit' do +RSpec.describe 'projects/services/edit' do let(:service) { create(:drone_ci_service, project: project) } let(:project) { create(:project) } diff --git a/spec/views/projects/settings/ci_cd/_autodevops_form.html.haml_spec.rb b/spec/views/projects/settings/ci_cd/_autodevops_form.html.haml_spec.rb index d25860ab301..b3f59a59ac8 100644 --- a/spec/views/projects/settings/ci_cd/_autodevops_form.html.haml_spec.rb +++ b/spec/views/projects/settings/ci_cd/_autodevops_form.html.haml_spec.rb @@ -2,7 +2,7 @@ require 'spec_helper' -describe 'projects/settings/ci_cd/_autodevops_form' do +RSpec.describe 'projects/settings/ci_cd/_autodevops_form' do let(:project) { create(:project, :repository) } before do diff --git a/spec/views/projects/settings/operations/show.html.haml_spec.rb b/spec/views/projects/settings/operations/show.html.haml_spec.rb index 7d6faae0f5a..316e3ad5218 100644 --- a/spec/views/projects/settings/operations/show.html.haml_spec.rb +++ b/spec/views/projects/settings/operations/show.html.haml_spec.rb @@ -2,7 +2,7 @@ require 'spec_helper' -describe 'projects/settings/operations/show' do +RSpec.describe 'projects/settings/operations/show' do let(:project) { create(:project) } let(:user) { create(:user) } diff --git a/spec/views/projects/show.html.haml_spec.rb b/spec/views/projects/show.html.haml_spec.rb index c28260f422c..89a6085ff10 100644 --- a/spec/views/projects/show.html.haml_spec.rb +++ b/spec/views/projects/show.html.haml_spec.rb @@ -2,7 +2,7 @@ require 'spec_helper' -describe 'projects/show.html.haml' do +RSpec.describe 'projects/show.html.haml' do include Devise::Test::ControllerHelpers let(:user) { create(:admin) } diff --git a/spec/views/projects/tags/index.html.haml_spec.rb b/spec/views/projects/tags/index.html.haml_spec.rb index 08fbada9c9c..4d501b82238 100644 --- a/spec/views/projects/tags/index.html.haml_spec.rb +++ b/spec/views/projects/tags/index.html.haml_spec.rb @@ -2,7 +2,7 @@ require 'spec_helper' -describe 'projects/tags/index.html.haml' do +RSpec.describe 'projects/tags/index.html.haml' do let(:project) { create(:project, :repository) } let(:tags) { TagsFinder.new(project.repository, {}).execute } let(:git_tag) { project.repository.tags.last } diff --git a/spec/views/projects/tree/_tree_header.html.haml_spec.rb b/spec/views/projects/tree/_tree_header.html.haml_spec.rb index 69ad331f880..4012d68acd0 100644 --- a/spec/views/projects/tree/_tree_header.html.haml_spec.rb +++ b/spec/views/projects/tree/_tree_header.html.haml_spec.rb @@ -2,7 +2,7 @@ require 'spec_helper' -describe 'projects/tree/_tree_header' do +RSpec.describe 'projects/tree/_tree_header' do let(:project) { create(:project, :repository) } let(:current_user) { create(:user) } let(:repository) { project.repository } diff --git a/spec/views/projects/tree/_tree_row.html.haml_spec.rb b/spec/views/projects/tree/_tree_row.html.haml_spec.rb index 864272fc146..43a37934afd 100644 --- a/spec/views/projects/tree/_tree_row.html.haml_spec.rb +++ b/spec/views/projects/tree/_tree_row.html.haml_spec.rb @@ -2,7 +2,7 @@ require 'spec_helper' -describe 'projects/tree/_tree_row' do +RSpec.describe 'projects/tree/_tree_row' do let(:project) { create(:project, :repository) } let(:repository) { project.repository } diff --git a/spec/views/projects/tree/show.html.haml_spec.rb b/spec/views/projects/tree/show.html.haml_spec.rb index 8c6b229247d..6337546e489 100644 --- a/spec/views/projects/tree/show.html.haml_spec.rb +++ b/spec/views/projects/tree/show.html.haml_spec.rb @@ -2,7 +2,7 @@ require 'spec_helper' -describe 'projects/tree/show' do +RSpec.describe 'projects/tree/show' do include Devise::Test::ControllerHelpers let(:project) { create(:project, :repository) } diff --git a/spec/views/search/_filter.html.haml_spec.rb b/spec/views/search/_filter.html.haml_spec.rb index d2cd636f8c6..eb32528e3c7 100644 --- a/spec/views/search/_filter.html.haml_spec.rb +++ b/spec/views/search/_filter.html.haml_spec.rb @@ -2,7 +2,7 @@ require 'spec_helper' -describe 'search/_filter' do +RSpec.describe 'search/_filter' do context 'when the search page is opened' do it 'displays the correct elements' do render diff --git a/spec/views/search/_form.html.haml_spec.rb b/spec/views/search/_form.html.haml_spec.rb index 69f40895d86..073a39e4ed6 100644 --- a/spec/views/search/_form.html.haml_spec.rb +++ b/spec/views/search/_form.html.haml_spec.rb @@ -2,7 +2,7 @@ require 'spec_helper' -describe 'search/_form' do +RSpec.describe 'search/_form' do context 'when the search page is opened' do it 'displays the correct elements' do render diff --git a/spec/views/search/_results.html.haml_spec.rb b/spec/views/search/_results.html.haml_spec.rb index 3243758c650..cd7a3559538 100644 --- a/spec/views/search/_results.html.haml_spec.rb +++ b/spec/views/search/_results.html.haml_spec.rb @@ -2,7 +2,7 @@ require 'spec_helper' -describe 'search/_results' do +RSpec.describe 'search/_results' do before do controller.params[:action] = 'show' diff --git a/spec/views/search/show.html.haml_spec.rb b/spec/views/search/show.html.haml_spec.rb index 483b913f2cc..9ddfe08c8f3 100644 --- a/spec/views/search/show.html.haml_spec.rb +++ b/spec/views/search/show.html.haml_spec.rb @@ -2,7 +2,7 @@ require 'spec_helper' -describe 'search/show' do +RSpec.describe 'search/show' do let(:search_term) { nil } before do diff --git a/spec/views/shared/_label_row.html.haml_spec.rb b/spec/views/shared/_label_row.html.haml_spec.rb index 0764f8480c8..1e2ed41bafc 100644 --- a/spec/views/shared/_label_row.html.haml_spec.rb +++ b/spec/views/shared/_label_row.html.haml_spec.rb @@ -1,7 +1,7 @@ # frozen_string_literal: true require 'spec_helper' -describe 'shared/_label_row.html.haml' do +RSpec.describe 'shared/_label_row.html.haml' do label_types = { 'project label': :label, 'group label': :group_label diff --git a/spec/views/shared/milestones/_issuable.html.haml_spec.rb b/spec/views/shared/milestones/_issuable.html.haml_spec.rb index 6e81fec79d4..46f79f60bbe 100644 --- a/spec/views/shared/milestones/_issuable.html.haml_spec.rb +++ b/spec/views/shared/milestones/_issuable.html.haml_spec.rb @@ -2,7 +2,7 @@ require 'spec_helper' -describe 'shared/milestones/_issuable.html.haml' do +RSpec.describe 'shared/milestones/_issuable.html.haml' do let_it_be(:project) { create(:project) } let_it_be(:user) { create(:user) } let_it_be(:milestone) { create(:milestone, project: project) } diff --git a/spec/views/shared/milestones/_issuables.html.haml_spec.rb b/spec/views/shared/milestones/_issuables.html.haml_spec.rb index f77c14a687b..70ab6914580 100644 --- a/spec/views/shared/milestones/_issuables.html.haml_spec.rb +++ b/spec/views/shared/milestones/_issuables.html.haml_spec.rb @@ -2,7 +2,7 @@ require 'spec_helper' -describe 'shared/milestones/_issuables.html.haml' do +RSpec.describe 'shared/milestones/_issuables.html.haml' do let(:issuables_size) { 100 } before do diff --git a/spec/views/shared/milestones/_top.html.haml_spec.rb b/spec/views/shared/milestones/_top.html.haml_spec.rb index 2d72e278706..1aa971709f1 100644 --- a/spec/views/shared/milestones/_top.html.haml_spec.rb +++ b/spec/views/shared/milestones/_top.html.haml_spec.rb @@ -2,7 +2,7 @@ require 'spec_helper' -describe 'shared/milestones/_top.html.haml' do +RSpec.describe 'shared/milestones/_top.html.haml' do let_it_be(:group) { create(:group) } let(:project) { create(:project, group: group) } let(:milestone) { create(:milestone, project: project) } diff --git a/spec/views/shared/notes/_form.html.haml_spec.rb b/spec/views/shared/notes/_form.html.haml_spec.rb index d354c2f0100..b7bad4c5d78 100644 --- a/spec/views/shared/notes/_form.html.haml_spec.rb +++ b/spec/views/shared/notes/_form.html.haml_spec.rb @@ -2,7 +2,7 @@ require 'spec_helper' -describe 'shared/notes/_form' do +RSpec.describe 'shared/notes/_form' do include Devise::Test::ControllerHelpers let(:user) { create(:user) } diff --git a/spec/views/shared/projects/_list.html.haml_spec.rb b/spec/views/shared/projects/_list.html.haml_spec.rb index d6043921fc8..037f988257b 100644 --- a/spec/views/shared/projects/_list.html.haml_spec.rb +++ b/spec/views/shared/projects/_list.html.haml_spec.rb @@ -2,7 +2,7 @@ require 'spec_helper' -describe 'shared/projects/_list' do +RSpec.describe 'shared/projects/_list' do let(:group) { create(:group) } before do diff --git a/spec/views/shared/projects/_project.html.haml_spec.rb b/spec/views/shared/projects/_project.html.haml_spec.rb index 8c3b8768469..62f23338c48 100644 --- a/spec/views/shared/projects/_project.html.haml_spec.rb +++ b/spec/views/shared/projects/_project.html.haml_spec.rb @@ -2,7 +2,7 @@ require 'spec_helper' -describe 'shared/projects/_project.html.haml' do +RSpec.describe 'shared/projects/_project.html.haml' do let_it_be(:project) { create(:project) } before do diff --git a/spec/views/shared/runners/show.html.haml_spec.rb b/spec/views/shared/runners/show.html.haml_spec.rb index 5e92928b143..5e2812eb48a 100644 --- a/spec/views/shared/runners/show.html.haml_spec.rb +++ b/spec/views/shared/runners/show.html.haml_spec.rb @@ -2,7 +2,7 @@ require 'spec_helper' -describe 'shared/runners/show.html.haml' do +RSpec.describe 'shared/runners/show.html.haml' do include PageLayoutHelper let(:runner) do diff --git a/spec/workers/admin_email_worker_spec.rb b/spec/workers/admin_email_worker_spec.rb index f72b932423f..1a5cb90bc17 100644 --- a/spec/workers/admin_email_worker_spec.rb +++ b/spec/workers/admin_email_worker_spec.rb @@ -2,7 +2,7 @@ require 'spec_helper' -describe AdminEmailWorker do +RSpec.describe AdminEmailWorker do subject(:worker) { described_class.new } describe '.perform' do diff --git a/spec/workers/archive_trace_worker_spec.rb b/spec/workers/archive_trace_worker_spec.rb index 44f7be15201..a9f256b1b3b 100644 --- a/spec/workers/archive_trace_worker_spec.rb +++ b/spec/workers/archive_trace_worker_spec.rb @@ -2,7 +2,7 @@ require 'spec_helper' -describe ArchiveTraceWorker do +RSpec.describe ArchiveTraceWorker do describe '#perform' do subject { described_class.new.perform(job&.id) } diff --git a/spec/workers/authorized_keys_worker_spec.rb b/spec/workers/authorized_keys_worker_spec.rb index 4f1dde0bfc0..50236f9ea7b 100644 --- a/spec/workers/authorized_keys_worker_spec.rb +++ b/spec/workers/authorized_keys_worker_spec.rb @@ -2,7 +2,7 @@ require 'spec_helper' -describe AuthorizedKeysWorker do +RSpec.describe AuthorizedKeysWorker do let(:worker) { described_class.new } describe '#perform' do diff --git a/spec/workers/authorized_project_update/project_create_worker_spec.rb b/spec/workers/authorized_project_update/project_create_worker_spec.rb index 10d6d58ee7a..5226ab30de7 100644 --- a/spec/workers/authorized_project_update/project_create_worker_spec.rb +++ b/spec/workers/authorized_project_update/project_create_worker_spec.rb @@ -2,7 +2,7 @@ require 'spec_helper' -describe AuthorizedProjectUpdate::ProjectCreateWorker do +RSpec.describe AuthorizedProjectUpdate::ProjectCreateWorker do let_it_be(:group) { create(:group, :private) } let_it_be(:group_project) { create(:project, group: group) } let_it_be(:group_user) { create(:user) } diff --git a/spec/workers/authorized_project_update/user_refresh_with_low_urgency_worker_spec.rb b/spec/workers/authorized_project_update/user_refresh_with_low_urgency_worker_spec.rb index fa029dae0fa..bd16eeb4712 100644 --- a/spec/workers/authorized_project_update/user_refresh_with_low_urgency_worker_spec.rb +++ b/spec/workers/authorized_project_update/user_refresh_with_low_urgency_worker_spec.rb @@ -2,7 +2,7 @@ require 'spec_helper' -describe AuthorizedProjectUpdate::UserRefreshWithLowUrgencyWorker do +RSpec.describe AuthorizedProjectUpdate::UserRefreshWithLowUrgencyWorker do it 'is labeled as low urgency' do expect(described_class.get_urgency).to eq(:low) end diff --git a/spec/workers/authorized_projects_worker_spec.rb b/spec/workers/authorized_projects_worker_spec.rb index 93f22471c56..fbfde77be97 100644 --- a/spec/workers/authorized_projects_worker_spec.rb +++ b/spec/workers/authorized_projects_worker_spec.rb @@ -2,6 +2,6 @@ require 'spec_helper' -describe AuthorizedProjectsWorker do +RSpec.describe AuthorizedProjectsWorker do it_behaves_like "refreshes user's project authorizations" end diff --git a/spec/workers/auto_devops/disable_worker_spec.rb b/spec/workers/auto_devops/disable_worker_spec.rb index 53113f286ba..239f4b09f5c 100644 --- a/spec/workers/auto_devops/disable_worker_spec.rb +++ b/spec/workers/auto_devops/disable_worker_spec.rb @@ -1,7 +1,7 @@ # frozen_string_literal: true require 'spec_helper' -describe AutoDevops::DisableWorker, '#perform' do +RSpec.describe AutoDevops::DisableWorker, '#perform' do let(:user) { create(:user, developer_projects: [project]) } let(:project) { create(:project, :repository, :auto_devops) } let(:auto_devops) { project.auto_devops } diff --git a/spec/workers/auto_merge_process_worker_spec.rb b/spec/workers/auto_merge_process_worker_spec.rb index 616727ce5ca..00d27d9c2b5 100644 --- a/spec/workers/auto_merge_process_worker_spec.rb +++ b/spec/workers/auto_merge_process_worker_spec.rb @@ -2,7 +2,7 @@ require 'spec_helper' -describe AutoMergeProcessWorker do +RSpec.describe AutoMergeProcessWorker do describe '#perform' do subject { described_class.new.perform(merge_request&.id) } diff --git a/spec/workers/background_migration_worker_spec.rb b/spec/workers/background_migration_worker_spec.rb index 2b2ffc9f5b9..15e93d62c7d 100644 --- a/spec/workers/background_migration_worker_spec.rb +++ b/spec/workers/background_migration_worker_spec.rb @@ -2,7 +2,7 @@ require 'spec_helper' -describe BackgroundMigrationWorker, :clean_gitlab_redis_shared_state do +RSpec.describe BackgroundMigrationWorker, :clean_gitlab_redis_shared_state do let(:worker) { described_class.new } describe '.minimum_interval' do diff --git a/spec/workers/build_coverage_worker_spec.rb b/spec/workers/build_coverage_worker_spec.rb index 25686ae68ca..4beb6e5972f 100644 --- a/spec/workers/build_coverage_worker_spec.rb +++ b/spec/workers/build_coverage_worker_spec.rb @@ -2,7 +2,7 @@ require 'spec_helper' -describe BuildCoverageWorker do +RSpec.describe BuildCoverageWorker do describe '#perform' do context 'when build exists' do let!(:build) { create(:ci_build) } diff --git a/spec/workers/build_finished_worker_spec.rb b/spec/workers/build_finished_worker_spec.rb index 849563d9608..e7f7ae84621 100644 --- a/spec/workers/build_finished_worker_spec.rb +++ b/spec/workers/build_finished_worker_spec.rb @@ -2,7 +2,7 @@ require 'spec_helper' -describe BuildFinishedWorker do +RSpec.describe BuildFinishedWorker do subject { described_class.new.perform(build.id) } describe '#perform' do diff --git a/spec/workers/build_hooks_worker_spec.rb b/spec/workers/build_hooks_worker_spec.rb index 59b252a8be3..aefbd7e590e 100644 --- a/spec/workers/build_hooks_worker_spec.rb +++ b/spec/workers/build_hooks_worker_spec.rb @@ -2,7 +2,7 @@ require 'spec_helper' -describe BuildHooksWorker do +RSpec.describe BuildHooksWorker do describe '#perform' do context 'when build exists' do let!(:build) { create(:ci_build) } diff --git a/spec/workers/build_success_worker_spec.rb b/spec/workers/build_success_worker_spec.rb index f4ff8cb15f8..0583d79ed46 100644 --- a/spec/workers/build_success_worker_spec.rb +++ b/spec/workers/build_success_worker_spec.rb @@ -2,7 +2,7 @@ require 'spec_helper' -describe BuildSuccessWorker do +RSpec.describe BuildSuccessWorker do describe '#perform' do subject { described_class.new.perform(build.id) } diff --git a/spec/workers/build_trace_sections_worker_spec.rb b/spec/workers/build_trace_sections_worker_spec.rb index 97fc0a2da0c..1c84b0083fb 100644 --- a/spec/workers/build_trace_sections_worker_spec.rb +++ b/spec/workers/build_trace_sections_worker_spec.rb @@ -2,7 +2,7 @@ require 'spec_helper' -describe BuildTraceSectionsWorker do +RSpec.describe BuildTraceSectionsWorker do describe '#perform' do context 'when build exists' do let!(:build) { create(:ci_build) } diff --git a/spec/workers/chat_notification_worker_spec.rb b/spec/workers/chat_notification_worker_spec.rb index e4dccf2bf6b..a20a136d197 100644 --- a/spec/workers/chat_notification_worker_spec.rb +++ b/spec/workers/chat_notification_worker_spec.rb @@ -2,7 +2,7 @@ require 'spec_helper' -describe ChatNotificationWorker do +RSpec.describe ChatNotificationWorker do let(:worker) { described_class.new } let(:chat_build) do create(:ci_build, pipeline: create(:ci_pipeline, source: :chat)) diff --git a/spec/workers/ci/archive_traces_cron_worker_spec.rb b/spec/workers/ci/archive_traces_cron_worker_spec.rb index 789e83783bb..14abe819587 100644 --- a/spec/workers/ci/archive_traces_cron_worker_spec.rb +++ b/spec/workers/ci/archive_traces_cron_worker_spec.rb @@ -2,7 +2,7 @@ require 'spec_helper' -describe Ci::ArchiveTracesCronWorker do +RSpec.describe Ci::ArchiveTracesCronWorker do subject { described_class.new.perform } let(:finished_at) { 1.day.ago } diff --git a/spec/workers/ci/build_prepare_worker_spec.rb b/spec/workers/ci/build_prepare_worker_spec.rb index 9f76696ee66..b2c74a920ea 100644 --- a/spec/workers/ci/build_prepare_worker_spec.rb +++ b/spec/workers/ci/build_prepare_worker_spec.rb @@ -2,7 +2,7 @@ require 'spec_helper' -describe Ci::BuildPrepareWorker do +RSpec.describe Ci::BuildPrepareWorker do subject { described_class.new.perform(build_id) } context 'build exists' do diff --git a/spec/workers/ci/build_report_result_worker_spec.rb b/spec/workers/ci/build_report_result_worker_spec.rb index 290a98366b4..aedfa70c8b8 100644 --- a/spec/workers/ci/build_report_result_worker_spec.rb +++ b/spec/workers/ci/build_report_result_worker_spec.rb @@ -2,7 +2,7 @@ require 'spec_helper' -describe Ci::BuildReportResultWorker do +RSpec.describe Ci::BuildReportResultWorker do subject { described_class.new.perform(build_id) } context 'when build exists' do diff --git a/spec/workers/ci/build_schedule_worker_spec.rb b/spec/workers/ci/build_schedule_worker_spec.rb index 647f9763fed..f8b4efc562b 100644 --- a/spec/workers/ci/build_schedule_worker_spec.rb +++ b/spec/workers/ci/build_schedule_worker_spec.rb @@ -2,7 +2,7 @@ require 'spec_helper' -describe Ci::BuildScheduleWorker do +RSpec.describe Ci::BuildScheduleWorker do subject { described_class.new.perform(build.id) } context 'when build is found' do diff --git a/spec/workers/ci/create_cross_project_pipeline_worker_spec.rb b/spec/workers/ci/create_cross_project_pipeline_worker_spec.rb index 492f5e812ee..95dcf5624cc 100644 --- a/spec/workers/ci/create_cross_project_pipeline_worker_spec.rb +++ b/spec/workers/ci/create_cross_project_pipeline_worker_spec.rb @@ -2,7 +2,7 @@ require 'spec_helper' -describe Ci::CreateCrossProjectPipelineWorker do +RSpec.describe Ci::CreateCrossProjectPipelineWorker do let_it_be(:user) { create(:user) } let_it_be(:project) { create(:project) } let_it_be(:pipeline) { create(:ci_pipeline, project: project) } diff --git a/spec/workers/ci/daily_build_group_report_results_worker_spec.rb b/spec/workers/ci/daily_build_group_report_results_worker_spec.rb index d9706982a62..e13c6311e46 100644 --- a/spec/workers/ci/daily_build_group_report_results_worker_spec.rb +++ b/spec/workers/ci/daily_build_group_report_results_worker_spec.rb @@ -2,7 +2,7 @@ require 'spec_helper' -describe Ci::DailyBuildGroupReportResultsWorker do +RSpec.describe Ci::DailyBuildGroupReportResultsWorker do describe '#perform' do let!(:pipeline) { create(:ci_pipeline) } diff --git a/spec/workers/ci/pipeline_bridge_status_worker_spec.rb b/spec/workers/ci/pipeline_bridge_status_worker_spec.rb index a6129b2cf93..6ec5eb0e639 100644 --- a/spec/workers/ci/pipeline_bridge_status_worker_spec.rb +++ b/spec/workers/ci/pipeline_bridge_status_worker_spec.rb @@ -2,7 +2,7 @@ require 'spec_helper' -describe Ci::PipelineBridgeStatusWorker do +RSpec.describe Ci::PipelineBridgeStatusWorker do describe '#perform' do subject { described_class.new.perform(pipeline_id) } diff --git a/spec/workers/ci/resource_groups/assign_resource_from_resource_group_worker_spec.rb b/spec/workers/ci/resource_groups/assign_resource_from_resource_group_worker_spec.rb index 634d932121e..f9914a7cecb 100644 --- a/spec/workers/ci/resource_groups/assign_resource_from_resource_group_worker_spec.rb +++ b/spec/workers/ci/resource_groups/assign_resource_from_resource_group_worker_spec.rb @@ -2,7 +2,7 @@ require 'spec_helper' -describe Ci::ResourceGroups::AssignResourceFromResourceGroupWorker do +RSpec.describe Ci::ResourceGroups::AssignResourceFromResourceGroupWorker do let(:worker) { described_class.new } describe '#perform' do diff --git a/spec/workers/cleanup_container_repository_worker_spec.rb b/spec/workers/cleanup_container_repository_worker_spec.rb index 1228c2c2d9c..0545f7a35e4 100644 --- a/spec/workers/cleanup_container_repository_worker_spec.rb +++ b/spec/workers/cleanup_container_repository_worker_spec.rb @@ -2,7 +2,7 @@ require 'spec_helper' -describe CleanupContainerRepositoryWorker, :clean_gitlab_redis_shared_state do +RSpec.describe CleanupContainerRepositoryWorker, :clean_gitlab_redis_shared_state do let(:repository) { create(:container_repository) } let(:project) { repository.project } let(:user) { project.owner } diff --git a/spec/workers/cluster_configure_istio_worker_spec.rb b/spec/workers/cluster_configure_istio_worker_spec.rb index 0f02d428ced..5d949fde973 100644 --- a/spec/workers/cluster_configure_istio_worker_spec.rb +++ b/spec/workers/cluster_configure_istio_worker_spec.rb @@ -2,7 +2,7 @@ require 'spec_helper' -describe ClusterConfigureIstioWorker do +RSpec.describe ClusterConfigureIstioWorker do describe '#perform' do shared_examples 'configure istio service' do it 'configures istio' do diff --git a/spec/workers/cluster_provision_worker_spec.rb b/spec/workers/cluster_provision_worker_spec.rb index 608639331fd..2d6ca4ab7e3 100644 --- a/spec/workers/cluster_provision_worker_spec.rb +++ b/spec/workers/cluster_provision_worker_spec.rb @@ -2,7 +2,7 @@ require 'spec_helper' -describe ClusterProvisionWorker do +RSpec.describe ClusterProvisionWorker do describe '#perform' do context 'when provider type is gcp' do let(:cluster) { create(:cluster, provider_type: :gcp, provider_gcp: provider) } diff --git a/spec/workers/cluster_update_app_worker_spec.rb b/spec/workers/cluster_update_app_worker_spec.rb index 848d2ab4eac..c24f40024fd 100644 --- a/spec/workers/cluster_update_app_worker_spec.rb +++ b/spec/workers/cluster_update_app_worker_spec.rb @@ -2,7 +2,7 @@ require 'spec_helper' -describe ClusterUpdateAppWorker do +RSpec.describe ClusterUpdateAppWorker do include ExclusiveLeaseHelpers let_it_be(:project) { create(:project) } diff --git a/spec/workers/cluster_wait_for_app_update_worker_spec.rb b/spec/workers/cluster_wait_for_app_update_worker_spec.rb index f1206bd85cb..b7f7622a0e6 100644 --- a/spec/workers/cluster_wait_for_app_update_worker_spec.rb +++ b/spec/workers/cluster_wait_for_app_update_worker_spec.rb @@ -2,7 +2,7 @@ require 'spec_helper' -describe ClusterWaitForAppUpdateWorker do +RSpec.describe ClusterWaitForAppUpdateWorker do let(:check_upgrade_progress_service) { spy } before do diff --git a/spec/workers/cluster_wait_for_ingress_ip_address_worker_spec.rb b/spec/workers/cluster_wait_for_ingress_ip_address_worker_spec.rb index a9ffdfb085e..7a42c988a92 100644 --- a/spec/workers/cluster_wait_for_ingress_ip_address_worker_spec.rb +++ b/spec/workers/cluster_wait_for_ingress_ip_address_worker_spec.rb @@ -2,7 +2,7 @@ require 'spec_helper' -describe ClusterWaitForIngressIpAddressWorker do +RSpec.describe ClusterWaitForIngressIpAddressWorker do describe '#perform' do let(:service) { instance_double(Clusters::Applications::CheckIngressIpAddressService, execute: true) } let(:application) { instance_double(Clusters::Applications::Ingress) } diff --git a/spec/workers/clusters/applications/activate_service_worker_spec.rb b/spec/workers/clusters/applications/activate_service_worker_spec.rb index 09f4c536edf..c157c57888e 100644 --- a/spec/workers/clusters/applications/activate_service_worker_spec.rb +++ b/spec/workers/clusters/applications/activate_service_worker_spec.rb @@ -2,7 +2,7 @@ require 'spec_helper' -describe Clusters::Applications::ActivateServiceWorker, '#perform' do +RSpec.describe Clusters::Applications::ActivateServiceWorker, '#perform' do context 'cluster exists' do describe 'prometheus service' do let(:service_name) { 'prometheus' } diff --git a/spec/workers/clusters/applications/check_prometheus_health_worker_spec.rb b/spec/workers/clusters/applications/check_prometheus_health_worker_spec.rb index a09b9ec4165..5a37031a55a 100644 --- a/spec/workers/clusters/applications/check_prometheus_health_worker_spec.rb +++ b/spec/workers/clusters/applications/check_prometheus_health_worker_spec.rb @@ -2,7 +2,7 @@ require 'spec_helper' -describe Clusters::Applications::CheckPrometheusHealthWorker, '#perform' do +RSpec.describe Clusters::Applications::CheckPrometheusHealthWorker, '#perform' do subject { described_class.new.perform } it 'triggers health service' do diff --git a/spec/workers/clusters/applications/deactivate_service_worker_spec.rb b/spec/workers/clusters/applications/deactivate_service_worker_spec.rb index 809843a1bc8..18cceaaf3b1 100644 --- a/spec/workers/clusters/applications/deactivate_service_worker_spec.rb +++ b/spec/workers/clusters/applications/deactivate_service_worker_spec.rb @@ -2,7 +2,7 @@ require 'spec_helper' -describe Clusters::Applications::DeactivateServiceWorker, '#perform' do +RSpec.describe Clusters::Applications::DeactivateServiceWorker, '#perform' do context 'cluster exists' do describe 'prometheus service' do let(:service_name) { 'prometheus' } diff --git a/spec/workers/clusters/applications/wait_for_uninstall_app_worker_spec.rb b/spec/workers/clusters/applications/wait_for_uninstall_app_worker_spec.rb index aaf5c9defc4..0191a2898b2 100644 --- a/spec/workers/clusters/applications/wait_for_uninstall_app_worker_spec.rb +++ b/spec/workers/clusters/applications/wait_for_uninstall_app_worker_spec.rb @@ -2,7 +2,7 @@ require 'spec_helper' -describe Clusters::Applications::WaitForUninstallAppWorker, '#perform' do +RSpec.describe Clusters::Applications::WaitForUninstallAppWorker, '#perform' do let(:app) { create(:clusters_applications_helm) } let(:app_name) { app.name } let(:app_id) { app.id } diff --git a/spec/workers/clusters/cleanup/app_worker_spec.rb b/spec/workers/clusters/cleanup/app_worker_spec.rb index 29c00db8079..661468f037f 100644 --- a/spec/workers/clusters/cleanup/app_worker_spec.rb +++ b/spec/workers/clusters/cleanup/app_worker_spec.rb @@ -2,7 +2,7 @@ require 'spec_helper' -describe Clusters::Cleanup::AppWorker do +RSpec.describe Clusters::Cleanup::AppWorker do describe '#perform' do subject { worker_instance.perform(cluster.id) } diff --git a/spec/workers/clusters/cleanup/project_namespace_worker_spec.rb b/spec/workers/clusters/cleanup/project_namespace_worker_spec.rb index 8b6f22e9a61..b9219586a0b 100644 --- a/spec/workers/clusters/cleanup/project_namespace_worker_spec.rb +++ b/spec/workers/clusters/cleanup/project_namespace_worker_spec.rb @@ -2,7 +2,7 @@ require 'spec_helper' -describe Clusters::Cleanup::ProjectNamespaceWorker do +RSpec.describe Clusters::Cleanup::ProjectNamespaceWorker do describe '#perform' do context 'when cluster.cleanup_status is cleanup_removing_project_namespaces' do let!(:cluster) { create(:cluster, :with_environments, :cleanup_removing_project_namespaces) } diff --git a/spec/workers/clusters/cleanup/service_account_worker_spec.rb b/spec/workers/clusters/cleanup/service_account_worker_spec.rb index 9af53dd63c1..dabc32a0ccd 100644 --- a/spec/workers/clusters/cleanup/service_account_worker_spec.rb +++ b/spec/workers/clusters/cleanup/service_account_worker_spec.rb @@ -2,7 +2,7 @@ require 'spec_helper' -describe Clusters::Cleanup::ServiceAccountWorker do +RSpec.describe Clusters::Cleanup::ServiceAccountWorker do describe '#perform' do let!(:cluster) { create(:cluster, :cleanup_removing_service_account) } diff --git a/spec/workers/concerns/application_worker_spec.rb b/spec/workers/concerns/application_worker_spec.rb index 087a36d2bd0..a18b83f199b 100644 --- a/spec/workers/concerns/application_worker_spec.rb +++ b/spec/workers/concerns/application_worker_spec.rb @@ -2,7 +2,7 @@ require 'spec_helper' -describe ApplicationWorker do +RSpec.describe ApplicationWorker do let_it_be(:worker) do Class.new do def self.name diff --git a/spec/workers/concerns/cluster_queue_spec.rb b/spec/workers/concerns/cluster_queue_spec.rb index 732d55dfbde..c03ca9cea48 100644 --- a/spec/workers/concerns/cluster_queue_spec.rb +++ b/spec/workers/concerns/cluster_queue_spec.rb @@ -2,7 +2,7 @@ require 'spec_helper' -describe ClusterQueue do +RSpec.describe ClusterQueue do let(:worker) do Class.new do def self.name diff --git a/spec/workers/concerns/cronjob_queue_spec.rb b/spec/workers/concerns/cronjob_queue_spec.rb index 0cea67bf116..d1ad5c65ea3 100644 --- a/spec/workers/concerns/cronjob_queue_spec.rb +++ b/spec/workers/concerns/cronjob_queue_spec.rb @@ -2,7 +2,7 @@ require 'spec_helper' -describe CronjobQueue do +RSpec.describe CronjobQueue do let(:worker) do Class.new do def self.name diff --git a/spec/workers/concerns/gitlab/github_import/object_importer_spec.rb b/spec/workers/concerns/gitlab/github_import/object_importer_spec.rb index 51b685b5792..d0cbc6b35e2 100644 --- a/spec/workers/concerns/gitlab/github_import/object_importer_spec.rb +++ b/spec/workers/concerns/gitlab/github_import/object_importer_spec.rb @@ -2,7 +2,7 @@ require 'spec_helper' -describe Gitlab::GithubImport::ObjectImporter do +RSpec.describe Gitlab::GithubImport::ObjectImporter do let(:worker) do Class.new do def self.name diff --git a/spec/workers/concerns/gitlab/github_import/queue_spec.rb b/spec/workers/concerns/gitlab/github_import/queue_spec.rb index d262bc2e05c..beca221b593 100644 --- a/spec/workers/concerns/gitlab/github_import/queue_spec.rb +++ b/spec/workers/concerns/gitlab/github_import/queue_spec.rb @@ -2,7 +2,7 @@ require 'spec_helper' -describe Gitlab::GithubImport::Queue do +RSpec.describe Gitlab::GithubImport::Queue do it 'sets the Sidekiq options for the worker' do worker = Class.new do def self.name diff --git a/spec/workers/concerns/gitlab/github_import/rescheduling_methods_spec.rb b/spec/workers/concerns/gitlab/github_import/rescheduling_methods_spec.rb index c4f6ddf9aca..09d64fe50bd 100644 --- a/spec/workers/concerns/gitlab/github_import/rescheduling_methods_spec.rb +++ b/spec/workers/concerns/gitlab/github_import/rescheduling_methods_spec.rb @@ -2,7 +2,7 @@ require 'spec_helper' -describe Gitlab::GithubImport::ReschedulingMethods do +RSpec.describe Gitlab::GithubImport::ReschedulingMethods do let(:worker) do Class.new { include(Gitlab::GithubImport::ReschedulingMethods) }.new end diff --git a/spec/workers/concerns/gitlab/github_import/stage_methods_spec.rb b/spec/workers/concerns/gitlab/github_import/stage_methods_spec.rb index f9081a875b5..b7635748498 100644 --- a/spec/workers/concerns/gitlab/github_import/stage_methods_spec.rb +++ b/spec/workers/concerns/gitlab/github_import/stage_methods_spec.rb @@ -2,7 +2,7 @@ require 'spec_helper' -describe Gitlab::GithubImport::StageMethods do +RSpec.describe Gitlab::GithubImport::StageMethods do let(:project) { create(:project) } let(:worker) do Class.new { include(Gitlab::GithubImport::StageMethods) }.new diff --git a/spec/workers/concerns/gitlab/notify_upon_death_spec.rb b/spec/workers/concerns/gitlab/notify_upon_death_spec.rb index 1c75ac99227..dd0a1cadc9c 100644 --- a/spec/workers/concerns/gitlab/notify_upon_death_spec.rb +++ b/spec/workers/concerns/gitlab/notify_upon_death_spec.rb @@ -2,7 +2,7 @@ require 'spec_helper' -describe Gitlab::NotifyUponDeath do +RSpec.describe Gitlab::NotifyUponDeath do let(:worker_class) do Class.new do include Sidekiq::Worker diff --git a/spec/workers/concerns/pipeline_background_queue_spec.rb b/spec/workers/concerns/pipeline_background_queue_spec.rb index 78ceafb359f..77c7e7440c5 100644 --- a/spec/workers/concerns/pipeline_background_queue_spec.rb +++ b/spec/workers/concerns/pipeline_background_queue_spec.rb @@ -2,7 +2,7 @@ require 'spec_helper' -describe PipelineBackgroundQueue do +RSpec.describe PipelineBackgroundQueue do let(:worker) do Class.new do def self.name diff --git a/spec/workers/concerns/pipeline_queue_spec.rb b/spec/workers/concerns/pipeline_queue_spec.rb index eedfceb8bf0..6c1ac2052e4 100644 --- a/spec/workers/concerns/pipeline_queue_spec.rb +++ b/spec/workers/concerns/pipeline_queue_spec.rb @@ -2,7 +2,7 @@ require 'spec_helper' -describe PipelineQueue do +RSpec.describe PipelineQueue do let(:worker) do Class.new do def self.name diff --git a/spec/workers/concerns/project_export_options_spec.rb b/spec/workers/concerns/project_export_options_spec.rb index 985afaaf11e..d7f5a8033b3 100644 --- a/spec/workers/concerns/project_export_options_spec.rb +++ b/spec/workers/concerns/project_export_options_spec.rb @@ -2,7 +2,7 @@ require 'spec_helper' -describe ProjectExportOptions do +RSpec.describe ProjectExportOptions do let(:project) { create(:project) } let(:project_export_job) { create(:project_export_job, project: project, jid: '123', status: 1) } let(:job) { { 'args' => [project.owner.id, project.id, nil, nil], 'jid' => '123' } } diff --git a/spec/workers/concerns/project_import_options_spec.rb b/spec/workers/concerns/project_import_options_spec.rb index c56dcc5ed82..85a26ddb0cb 100644 --- a/spec/workers/concerns/project_import_options_spec.rb +++ b/spec/workers/concerns/project_import_options_spec.rb @@ -2,7 +2,7 @@ require 'spec_helper' -describe ProjectImportOptions do +RSpec.describe ProjectImportOptions do let(:project) { create(:project, :import_started) } let(:job) { { 'args' => [project.id, nil, nil], 'jid' => '123' } } let(:worker_class) do diff --git a/spec/workers/concerns/reenqueuer_spec.rb b/spec/workers/concerns/reenqueuer_spec.rb index b28f83d211b..df0724045c1 100644 --- a/spec/workers/concerns/reenqueuer_spec.rb +++ b/spec/workers/concerns/reenqueuer_spec.rb @@ -2,7 +2,7 @@ require 'spec_helper' -describe Reenqueuer do +RSpec.describe Reenqueuer do include ExclusiveLeaseHelpers let_it_be(:worker_class) do @@ -93,7 +93,7 @@ describe Reenqueuer do end end -describe Reenqueuer::ReenqueuerSleeper do +RSpec.describe Reenqueuer::ReenqueuerSleeper do let_it_be(:dummy_class) do Class.new do include Reenqueuer::ReenqueuerSleeper diff --git a/spec/workers/concerns/repository_check_queue_spec.rb b/spec/workers/concerns/repository_check_queue_spec.rb index 55ed71f124c..ae377c09b37 100644 --- a/spec/workers/concerns/repository_check_queue_spec.rb +++ b/spec/workers/concerns/repository_check_queue_spec.rb @@ -2,7 +2,7 @@ require 'spec_helper' -describe RepositoryCheckQueue do +RSpec.describe RepositoryCheckQueue do let(:worker) do Class.new do def self.name diff --git a/spec/workers/concerns/waitable_worker_spec.rb b/spec/workers/concerns/waitable_worker_spec.rb index e7ef96c685d..5d08d38380a 100644 --- a/spec/workers/concerns/waitable_worker_spec.rb +++ b/spec/workers/concerns/waitable_worker_spec.rb @@ -2,7 +2,7 @@ require 'spec_helper' -describe WaitableWorker do +RSpec.describe WaitableWorker do let(:worker) do Class.new do def self.name diff --git a/spec/workers/concerns/worker_context_spec.rb b/spec/workers/concerns/worker_context_spec.rb index 4e8c81c57dc..3de37b99aba 100644 --- a/spec/workers/concerns/worker_context_spec.rb +++ b/spec/workers/concerns/worker_context_spec.rb @@ -2,7 +2,7 @@ require 'spec_helper' -describe WorkerContext do +RSpec.describe WorkerContext do let(:worker) do Class.new do def self.name diff --git a/spec/workers/container_expiration_policy_worker_spec.rb b/spec/workers/container_expiration_policy_worker_spec.rb index b15a28dcdca..868eb6b192e 100644 --- a/spec/workers/container_expiration_policy_worker_spec.rb +++ b/spec/workers/container_expiration_policy_worker_spec.rb @@ -2,7 +2,7 @@ require 'spec_helper' -describe ContainerExpirationPolicyWorker do +RSpec.describe ContainerExpirationPolicyWorker do include ExclusiveLeaseHelpers subject { described_class.new.perform } diff --git a/spec/workers/create_commit_signature_worker_spec.rb b/spec/workers/create_commit_signature_worker_spec.rb index fd5d99b3265..d283ff5b732 100644 --- a/spec/workers/create_commit_signature_worker_spec.rb +++ b/spec/workers/create_commit_signature_worker_spec.rb @@ -2,7 +2,7 @@ require 'spec_helper' -describe CreateCommitSignatureWorker do +RSpec.describe CreateCommitSignatureWorker do let(:project) { create(:project, :repository) } let(:commits) { project.repository.commits('HEAD', limit: 3).commits } let(:commit_shas) { commits.map(&:id) } diff --git a/spec/workers/create_evidence_worker_spec.rb b/spec/workers/create_evidence_worker_spec.rb index b8c622f7d1d..c700c086163 100644 --- a/spec/workers/create_evidence_worker_spec.rb +++ b/spec/workers/create_evidence_worker_spec.rb @@ -2,7 +2,7 @@ require 'spec_helper' -describe CreateEvidenceWorker do +RSpec.describe CreateEvidenceWorker do let(:project) { create(:project, :repository) } let(:release) { create(:release, project: project) } let(:pipeline) { create(:ci_empty_pipeline, sha: release.sha, project: project) } diff --git a/spec/workers/create_note_diff_file_worker_spec.rb b/spec/workers/create_note_diff_file_worker_spec.rb index e35aaa7d593..4c1df8ade06 100644 --- a/spec/workers/create_note_diff_file_worker_spec.rb +++ b/spec/workers/create_note_diff_file_worker_spec.rb @@ -2,7 +2,7 @@ require 'spec_helper' -describe CreateNoteDiffFileWorker do +RSpec.describe CreateNoteDiffFileWorker do describe '#perform' do let(:diff_note) { create(:diff_note_on_merge_request) } diff --git a/spec/workers/create_pipeline_worker_spec.rb b/spec/workers/create_pipeline_worker_spec.rb index 62a17da80c0..6a3729fa28a 100644 --- a/spec/workers/create_pipeline_worker_spec.rb +++ b/spec/workers/create_pipeline_worker_spec.rb @@ -2,7 +2,7 @@ require 'spec_helper' -describe CreatePipelineWorker do +RSpec.describe CreatePipelineWorker do describe '#perform' do let(:worker) { described_class.new } diff --git a/spec/workers/delete_container_repository_worker_spec.rb b/spec/workers/delete_container_repository_worker_spec.rb index 8c40611a959..b8363a2f81a 100644 --- a/spec/workers/delete_container_repository_worker_spec.rb +++ b/spec/workers/delete_container_repository_worker_spec.rb @@ -2,7 +2,7 @@ require 'spec_helper' -describe DeleteContainerRepositoryWorker do +RSpec.describe DeleteContainerRepositoryWorker do let(:registry) { create(:container_repository) } let(:project) { registry.project } let(:user) { project.owner } diff --git a/spec/workers/delete_diff_files_worker_spec.rb b/spec/workers/delete_diff_files_worker_spec.rb index 9f8b20df48e..b3b01588e0b 100644 --- a/spec/workers/delete_diff_files_worker_spec.rb +++ b/spec/workers/delete_diff_files_worker_spec.rb @@ -2,7 +2,7 @@ require 'spec_helper' -describe DeleteDiffFilesWorker do +RSpec.describe DeleteDiffFilesWorker do describe '#perform' do let(:merge_request) { create(:merge_request) } let(:merge_request_diff) { merge_request.merge_request_diff } diff --git a/spec/workers/delete_merged_branches_worker_spec.rb b/spec/workers/delete_merged_branches_worker_spec.rb index 3eaeb7e0797..861ca111b92 100644 --- a/spec/workers/delete_merged_branches_worker_spec.rb +++ b/spec/workers/delete_merged_branches_worker_spec.rb @@ -2,7 +2,7 @@ require 'spec_helper' -describe DeleteMergedBranchesWorker do +RSpec.describe DeleteMergedBranchesWorker do subject(:worker) { described_class.new } let(:project) { create(:project, :repository) } diff --git a/spec/workers/delete_user_worker_spec.rb b/spec/workers/delete_user_worker_spec.rb index c963b886e62..52f2c692b8c 100644 --- a/spec/workers/delete_user_worker_spec.rb +++ b/spec/workers/delete_user_worker_spec.rb @@ -2,7 +2,7 @@ require 'spec_helper' -describe DeleteUserWorker do +RSpec.describe DeleteUserWorker do let!(:user) { create(:user) } let!(:current_user) { create(:user) } diff --git a/spec/workers/deployments/finished_worker_spec.rb b/spec/workers/deployments/finished_worker_spec.rb index 2961ff599c3..9b4bd78c03a 100644 --- a/spec/workers/deployments/finished_worker_spec.rb +++ b/spec/workers/deployments/finished_worker_spec.rb @@ -2,7 +2,7 @@ require 'spec_helper' -describe Deployments::FinishedWorker do +RSpec.describe Deployments::FinishedWorker do let(:worker) { described_class.new } describe '#perform' do diff --git a/spec/workers/deployments/success_worker_spec.rb b/spec/workers/deployments/success_worker_spec.rb index 7f2816d7535..7c21a3147a7 100644 --- a/spec/workers/deployments/success_worker_spec.rb +++ b/spec/workers/deployments/success_worker_spec.rb @@ -2,7 +2,7 @@ require 'spec_helper' -describe Deployments::SuccessWorker do +RSpec.describe Deployments::SuccessWorker do subject { described_class.new.perform(deployment&.id) } context 'when successful deployment' do diff --git a/spec/workers/design_management/new_version_worker_spec.rb b/spec/workers/design_management/new_version_worker_spec.rb index ef7cd8de108..4d57c46487e 100644 --- a/spec/workers/design_management/new_version_worker_spec.rb +++ b/spec/workers/design_management/new_version_worker_spec.rb @@ -2,7 +2,7 @@ require 'spec_helper' -describe DesignManagement::NewVersionWorker do +RSpec.describe DesignManagement::NewVersionWorker do describe '#perform' do let(:worker) { described_class.new } diff --git a/spec/workers/detect_repository_languages_worker_spec.rb b/spec/workers/detect_repository_languages_worker_spec.rb index 84af49050d4..217e16bd155 100644 --- a/spec/workers/detect_repository_languages_worker_spec.rb +++ b/spec/workers/detect_repository_languages_worker_spec.rb @@ -2,7 +2,7 @@ require 'spec_helper' -describe DetectRepositoryLanguagesWorker do +RSpec.describe DetectRepositoryLanguagesWorker do let_it_be(:project) { create(:project) } subject { described_class.new } diff --git a/spec/workers/email_receiver_worker_spec.rb b/spec/workers/email_receiver_worker_spec.rb index f8a31fcdee6..8bf7f3f552d 100644 --- a/spec/workers/email_receiver_worker_spec.rb +++ b/spec/workers/email_receiver_worker_spec.rb @@ -2,7 +2,7 @@ require "spec_helper" -describe EmailReceiverWorker, :mailer do +RSpec.describe EmailReceiverWorker, :mailer do let(:raw_message) { fixture_file('emails/valid_reply.eml') } context "when reply by email is enabled" do diff --git a/spec/workers/emails_on_push_worker_spec.rb b/spec/workers/emails_on_push_worker_spec.rb index 0f87df89c29..fac463b4dd4 100644 --- a/spec/workers/emails_on_push_worker_spec.rb +++ b/spec/workers/emails_on_push_worker_spec.rb @@ -2,7 +2,7 @@ require 'spec_helper' -describe EmailsOnPushWorker, :mailer do +RSpec.describe EmailsOnPushWorker, :mailer do include RepoHelpers include EmailSpec::Matchers diff --git a/spec/workers/environments/auto_stop_cron_worker_spec.rb b/spec/workers/environments/auto_stop_cron_worker_spec.rb index 6773637d4a7..1e86597d288 100644 --- a/spec/workers/environments/auto_stop_cron_worker_spec.rb +++ b/spec/workers/environments/auto_stop_cron_worker_spec.rb @@ -2,7 +2,7 @@ require 'spec_helper' -describe Environments::AutoStopCronWorker do +RSpec.describe Environments::AutoStopCronWorker do subject { worker.perform } let(:worker) { described_class.new } diff --git a/spec/workers/error_tracking_issue_link_worker_spec.rb b/spec/workers/error_tracking_issue_link_worker_spec.rb index 701d54b72f0..5be568c2dad 100644 --- a/spec/workers/error_tracking_issue_link_worker_spec.rb +++ b/spec/workers/error_tracking_issue_link_worker_spec.rb @@ -2,7 +2,7 @@ require 'spec_helper' -describe ErrorTrackingIssueLinkWorker do +RSpec.describe ErrorTrackingIssueLinkWorker do let_it_be(:error_tracking) { create(:project_error_tracking_setting) } let_it_be(:project) { error_tracking.project } let_it_be(:issue) { create(:issue, project: project) } diff --git a/spec/workers/every_sidekiq_worker_spec.rb b/spec/workers/every_sidekiq_worker_spec.rb index 195783c74df..f01c57c4564 100644 --- a/spec/workers/every_sidekiq_worker_spec.rb +++ b/spec/workers/every_sidekiq_worker_spec.rb @@ -2,7 +2,7 @@ require 'spec_helper' -describe 'Every Sidekiq worker' do +RSpec.describe 'Every Sidekiq worker' do let(:workers_without_defaults) do Gitlab::SidekiqConfig.workers - Gitlab::SidekiqConfig::DEFAULT_WORKERS end diff --git a/spec/workers/expire_build_artifacts_worker_spec.rb b/spec/workers/expire_build_artifacts_worker_spec.rb index 06561e94fb7..995f37daf17 100644 --- a/spec/workers/expire_build_artifacts_worker_spec.rb +++ b/spec/workers/expire_build_artifacts_worker_spec.rb @@ -2,7 +2,7 @@ require 'spec_helper' -describe ExpireBuildArtifactsWorker do +RSpec.describe ExpireBuildArtifactsWorker do let(:worker) { described_class.new } describe '#perform' do diff --git a/spec/workers/expire_build_instance_artifacts_worker_spec.rb b/spec/workers/expire_build_instance_artifacts_worker_spec.rb index 136a04672a7..38318447b5f 100644 --- a/spec/workers/expire_build_instance_artifacts_worker_spec.rb +++ b/spec/workers/expire_build_instance_artifacts_worker_spec.rb @@ -2,7 +2,7 @@ require 'spec_helper' -describe ExpireBuildInstanceArtifactsWorker do +RSpec.describe ExpireBuildInstanceArtifactsWorker do include RepoHelpers let(:worker) { described_class.new } diff --git a/spec/workers/expire_job_cache_worker_spec.rb b/spec/workers/expire_job_cache_worker_spec.rb index 062926cf7aa..b4f8f56563b 100644 --- a/spec/workers/expire_job_cache_worker_spec.rb +++ b/spec/workers/expire_job_cache_worker_spec.rb @@ -2,7 +2,7 @@ require 'spec_helper' -describe ExpireJobCacheWorker do +RSpec.describe ExpireJobCacheWorker do let_it_be(:pipeline) { create(:ci_empty_pipeline) } let(:project) { pipeline.project } diff --git a/spec/workers/expire_pipeline_cache_worker_spec.rb b/spec/workers/expire_pipeline_cache_worker_spec.rb index 61ea22fbd32..fb6ee67311c 100644 --- a/spec/workers/expire_pipeline_cache_worker_spec.rb +++ b/spec/workers/expire_pipeline_cache_worker_spec.rb @@ -2,7 +2,7 @@ require 'spec_helper' -describe ExpirePipelineCacheWorker do +RSpec.describe ExpirePipelineCacheWorker do let_it_be(:user) { create(:user) } let_it_be(:project) { create(:project) } let_it_be(:pipeline) { create(:ci_pipeline, project: project) } diff --git a/spec/workers/export_csv_worker_spec.rb b/spec/workers/export_csv_worker_spec.rb index 87285b6264a..1a5b17ee35b 100644 --- a/spec/workers/export_csv_worker_spec.rb +++ b/spec/workers/export_csv_worker_spec.rb @@ -2,7 +2,7 @@ require 'spec_helper' -describe ExportCsvWorker do +RSpec.describe ExportCsvWorker do let(:user) { create(:user) } let(:project) { create(:project, creator: user) } diff --git a/spec/workers/external_service_reactive_caching_worker_spec.rb b/spec/workers/external_service_reactive_caching_worker_spec.rb index 45cce71b75b..907894d9b9a 100644 --- a/spec/workers/external_service_reactive_caching_worker_spec.rb +++ b/spec/workers/external_service_reactive_caching_worker_spec.rb @@ -2,6 +2,6 @@ require 'spec_helper' -describe ExternalServiceReactiveCachingWorker do +RSpec.describe ExternalServiceReactiveCachingWorker do it_behaves_like 'reactive cacheable worker' end diff --git a/spec/workers/file_hook_worker_spec.rb b/spec/workers/file_hook_worker_spec.rb index 1a7e753fc4a..c171dc37e5f 100644 --- a/spec/workers/file_hook_worker_spec.rb +++ b/spec/workers/file_hook_worker_spec.rb @@ -2,7 +2,7 @@ require 'spec_helper' -describe FileHookWorker do +RSpec.describe FileHookWorker do include RepoHelpers let(:filename) { 'my_file_hook.rb' } diff --git a/spec/workers/git_garbage_collect_worker_spec.rb b/spec/workers/git_garbage_collect_worker_spec.rb index 64ad4ba7eb6..cb6396e2859 100644 --- a/spec/workers/git_garbage_collect_worker_spec.rb +++ b/spec/workers/git_garbage_collect_worker_spec.rb @@ -4,7 +4,7 @@ require 'fileutils' require 'spec_helper' -describe GitGarbageCollectWorker do +RSpec.describe GitGarbageCollectWorker do include GitHelpers let(:project) { create(:project, :repository) } diff --git a/spec/workers/gitlab/github_import/advance_stage_worker_spec.rb b/spec/workers/gitlab/github_import/advance_stage_worker_spec.rb index b1647d8c7df..4e8261f61c4 100644 --- a/spec/workers/gitlab/github_import/advance_stage_worker_spec.rb +++ b/spec/workers/gitlab/github_import/advance_stage_worker_spec.rb @@ -2,7 +2,7 @@ require 'spec_helper' -describe Gitlab::GithubImport::AdvanceStageWorker, :clean_gitlab_redis_shared_state do +RSpec.describe Gitlab::GithubImport::AdvanceStageWorker, :clean_gitlab_redis_shared_state do let(:project) { create(:project) } let(:import_state) { create(:import_state, project: project, jid: '123') } let(:worker) { described_class.new } diff --git a/spec/workers/gitlab/github_import/import_diff_note_worker_spec.rb b/spec/workers/gitlab/github_import/import_diff_note_worker_spec.rb index 42d69ff6166..211eba993f7 100644 --- a/spec/workers/gitlab/github_import/import_diff_note_worker_spec.rb +++ b/spec/workers/gitlab/github_import/import_diff_note_worker_spec.rb @@ -2,7 +2,7 @@ require 'spec_helper' -describe Gitlab::GithubImport::ImportDiffNoteWorker do +RSpec.describe Gitlab::GithubImport::ImportDiffNoteWorker do let(:worker) { described_class.new } describe '#import' do diff --git a/spec/workers/gitlab/github_import/import_issue_worker_spec.rb b/spec/workers/gitlab/github_import/import_issue_worker_spec.rb index 06a573e16b7..1d285790ee2 100644 --- a/spec/workers/gitlab/github_import/import_issue_worker_spec.rb +++ b/spec/workers/gitlab/github_import/import_issue_worker_spec.rb @@ -2,7 +2,7 @@ require 'spec_helper' -describe Gitlab::GithubImport::ImportIssueWorker do +RSpec.describe Gitlab::GithubImport::ImportIssueWorker do let(:worker) { described_class.new } describe '#import' do diff --git a/spec/workers/gitlab/github_import/import_note_worker_spec.rb b/spec/workers/gitlab/github_import/import_note_worker_spec.rb index 5110c3ff11b..618aca4ff0a 100644 --- a/spec/workers/gitlab/github_import/import_note_worker_spec.rb +++ b/spec/workers/gitlab/github_import/import_note_worker_spec.rb @@ -2,7 +2,7 @@ require 'spec_helper' -describe Gitlab::GithubImport::ImportNoteWorker do +RSpec.describe Gitlab::GithubImport::ImportNoteWorker do let(:worker) { described_class.new } describe '#import' do diff --git a/spec/workers/gitlab/github_import/import_pull_request_worker_spec.rb b/spec/workers/gitlab/github_import/import_pull_request_worker_spec.rb index d46e381fc51..0f5df302d56 100644 --- a/spec/workers/gitlab/github_import/import_pull_request_worker_spec.rb +++ b/spec/workers/gitlab/github_import/import_pull_request_worker_spec.rb @@ -2,7 +2,7 @@ require 'spec_helper' -describe Gitlab::GithubImport::ImportPullRequestWorker do +RSpec.describe Gitlab::GithubImport::ImportPullRequestWorker do let(:worker) { described_class.new } describe '#import' do diff --git a/spec/workers/gitlab/github_import/refresh_import_jid_worker_spec.rb b/spec/workers/gitlab/github_import/refresh_import_jid_worker_spec.rb index fa4ded8e42f..3a8b585fa77 100644 --- a/spec/workers/gitlab/github_import/refresh_import_jid_worker_spec.rb +++ b/spec/workers/gitlab/github_import/refresh_import_jid_worker_spec.rb @@ -2,7 +2,7 @@ require 'spec_helper' -describe Gitlab::GithubImport::RefreshImportJidWorker do +RSpec.describe Gitlab::GithubImport::RefreshImportJidWorker do let(:worker) { described_class.new } describe '.perform_in_the_future' do diff --git a/spec/workers/gitlab/github_import/stage/finish_import_worker_spec.rb b/spec/workers/gitlab/github_import/stage/finish_import_worker_spec.rb index 35a856802c2..c821e0aaa09 100644 --- a/spec/workers/gitlab/github_import/stage/finish_import_worker_spec.rb +++ b/spec/workers/gitlab/github_import/stage/finish_import_worker_spec.rb @@ -2,7 +2,7 @@ require 'spec_helper' -describe Gitlab::GithubImport::Stage::FinishImportWorker do +RSpec.describe Gitlab::GithubImport::Stage::FinishImportWorker do let(:project) { create(:project) } let(:worker) { described_class.new } diff --git a/spec/workers/gitlab/github_import/stage/import_base_data_worker_spec.rb b/spec/workers/gitlab/github_import/stage/import_base_data_worker_spec.rb index 0c7fc2a164e..f68d0838501 100644 --- a/spec/workers/gitlab/github_import/stage/import_base_data_worker_spec.rb +++ b/spec/workers/gitlab/github_import/stage/import_base_data_worker_spec.rb @@ -2,7 +2,7 @@ require 'spec_helper' -describe Gitlab::GithubImport::Stage::ImportBaseDataWorker do +RSpec.describe Gitlab::GithubImport::Stage::ImportBaseDataWorker do let(:project) { create(:project) } let(:import_state) { create(:import_state, project: project) } let(:worker) { described_class.new } diff --git a/spec/workers/gitlab/github_import/stage/import_issues_and_diff_notes_worker_spec.rb b/spec/workers/gitlab/github_import/stage/import_issues_and_diff_notes_worker_spec.rb index 5d96f562c30..f2a28ec40b8 100644 --- a/spec/workers/gitlab/github_import/stage/import_issues_and_diff_notes_worker_spec.rb +++ b/spec/workers/gitlab/github_import/stage/import_issues_and_diff_notes_worker_spec.rb @@ -2,7 +2,7 @@ require 'spec_helper' -describe Gitlab::GithubImport::Stage::ImportIssuesAndDiffNotesWorker do +RSpec.describe Gitlab::GithubImport::Stage::ImportIssuesAndDiffNotesWorker do let(:project) { create(:project) } let(:worker) { described_class.new } diff --git a/spec/workers/gitlab/github_import/stage/import_lfs_objects_worker_spec.rb b/spec/workers/gitlab/github_import/stage/import_lfs_objects_worker_spec.rb index e7c9dabb292..103d55890c4 100644 --- a/spec/workers/gitlab/github_import/stage/import_lfs_objects_worker_spec.rb +++ b/spec/workers/gitlab/github_import/stage/import_lfs_objects_worker_spec.rb @@ -2,7 +2,7 @@ require 'spec_helper' -describe Gitlab::GithubImport::Stage::ImportLfsObjectsWorker do +RSpec.describe Gitlab::GithubImport::Stage::ImportLfsObjectsWorker do let(:project) { create(:project) } let(:worker) { described_class.new } diff --git a/spec/workers/gitlab/github_import/stage/import_notes_worker_spec.rb b/spec/workers/gitlab/github_import/stage/import_notes_worker_spec.rb index 90590a45900..73b19239f4a 100644 --- a/spec/workers/gitlab/github_import/stage/import_notes_worker_spec.rb +++ b/spec/workers/gitlab/github_import/stage/import_notes_worker_spec.rb @@ -2,7 +2,7 @@ require 'spec_helper' -describe Gitlab::GithubImport::Stage::ImportNotesWorker do +RSpec.describe Gitlab::GithubImport::Stage::ImportNotesWorker do let(:project) { create(:project) } let(:worker) { described_class.new } diff --git a/spec/workers/gitlab/github_import/stage/import_pull_requests_worker_spec.rb b/spec/workers/gitlab/github_import/stage/import_pull_requests_worker_spec.rb index 15d485f1018..0acbca7032c 100644 --- a/spec/workers/gitlab/github_import/stage/import_pull_requests_worker_spec.rb +++ b/spec/workers/gitlab/github_import/stage/import_pull_requests_worker_spec.rb @@ -2,7 +2,7 @@ require 'spec_helper' -describe Gitlab::GithubImport::Stage::ImportPullRequestsWorker do +RSpec.describe Gitlab::GithubImport::Stage::ImportPullRequestsWorker do let(:project) { create(:project) } let(:import_state) { create(:import_state, project: project) } let(:worker) { described_class.new } diff --git a/spec/workers/gitlab/github_import/stage/import_repository_worker_spec.rb b/spec/workers/gitlab/github_import/stage/import_repository_worker_spec.rb index 3a8fe73622a..bc51a44e057 100644 --- a/spec/workers/gitlab/github_import/stage/import_repository_worker_spec.rb +++ b/spec/workers/gitlab/github_import/stage/import_repository_worker_spec.rb @@ -2,7 +2,7 @@ require 'spec_helper' -describe Gitlab::GithubImport::Stage::ImportRepositoryWorker do +RSpec.describe Gitlab::GithubImport::Stage::ImportRepositoryWorker do let(:project) { double(:project, id: 4) } let(:worker) { described_class.new } diff --git a/spec/workers/gitlab/jira_import/import_issue_worker_spec.rb b/spec/workers/gitlab/jira_import/import_issue_worker_spec.rb index 2de609761e2..4a4ef5700fa 100644 --- a/spec/workers/gitlab/jira_import/import_issue_worker_spec.rb +++ b/spec/workers/gitlab/jira_import/import_issue_worker_spec.rb @@ -2,7 +2,7 @@ require 'spec_helper' -describe Gitlab::JiraImport::ImportIssueWorker do +RSpec.describe Gitlab::JiraImport::ImportIssueWorker do let_it_be(:user) { create(:user) } let_it_be(:project) { create(:project) } let_it_be(:jira_issue_label_1) { create(:label, project: project) } diff --git a/spec/workers/gitlab/jira_import/stage/finish_import_worker_spec.rb b/spec/workers/gitlab/jira_import/stage/finish_import_worker_spec.rb index 084302be7d8..23a764bd972 100644 --- a/spec/workers/gitlab/jira_import/stage/finish_import_worker_spec.rb +++ b/spec/workers/gitlab/jira_import/stage/finish_import_worker_spec.rb @@ -2,7 +2,7 @@ require 'spec_helper' -describe Gitlab::JiraImport::Stage::FinishImportWorker do +RSpec.describe Gitlab::JiraImport::Stage::FinishImportWorker do let_it_be(:project) { create(:project) } let_it_be(:worker) { described_class.new } diff --git a/spec/workers/gitlab/jira_import/stage/import_attachments_worker_spec.rb b/spec/workers/gitlab/jira_import/stage/import_attachments_worker_spec.rb index 34981d974cd..28da93b8d00 100644 --- a/spec/workers/gitlab/jira_import/stage/import_attachments_worker_spec.rb +++ b/spec/workers/gitlab/jira_import/stage/import_attachments_worker_spec.rb @@ -2,7 +2,7 @@ require 'spec_helper' -describe Gitlab::JiraImport::Stage::ImportAttachmentsWorker do +RSpec.describe Gitlab::JiraImport::Stage::ImportAttachmentsWorker do let_it_be(:project) { create(:project, import_type: 'jira') } describe 'modules' do diff --git a/spec/workers/gitlab/jira_import/stage/import_issues_worker_spec.rb b/spec/workers/gitlab/jira_import/stage/import_issues_worker_spec.rb index 40f6cf75412..f82f6ccd9d6 100644 --- a/spec/workers/gitlab/jira_import/stage/import_issues_worker_spec.rb +++ b/spec/workers/gitlab/jira_import/stage/import_issues_worker_spec.rb @@ -2,7 +2,7 @@ require 'spec_helper' -describe Gitlab::JiraImport::Stage::ImportIssuesWorker do +RSpec.describe Gitlab::JiraImport::Stage::ImportIssuesWorker do include JiraServiceHelper let_it_be(:user) { create(:user) } diff --git a/spec/workers/gitlab/jira_import/stage/import_labels_worker_spec.rb b/spec/workers/gitlab/jira_import/stage/import_labels_worker_spec.rb index 1215b41bd9f..0b7a35a92e2 100644 --- a/spec/workers/gitlab/jira_import/stage/import_labels_worker_spec.rb +++ b/spec/workers/gitlab/jira_import/stage/import_labels_worker_spec.rb @@ -2,7 +2,7 @@ require 'spec_helper' -describe Gitlab::JiraImport::Stage::ImportLabelsWorker do +RSpec.describe Gitlab::JiraImport::Stage::ImportLabelsWorker do include JiraServiceHelper let_it_be(:user) { create(:user) } diff --git a/spec/workers/gitlab/jira_import/stage/import_notes_worker_spec.rb b/spec/workers/gitlab/jira_import/stage/import_notes_worker_spec.rb index a0a9ad6f695..2502bbf1df4 100644 --- a/spec/workers/gitlab/jira_import/stage/import_notes_worker_spec.rb +++ b/spec/workers/gitlab/jira_import/stage/import_notes_worker_spec.rb @@ -2,7 +2,7 @@ require 'spec_helper' -describe Gitlab::JiraImport::Stage::ImportNotesWorker do +RSpec.describe Gitlab::JiraImport::Stage::ImportNotesWorker do let_it_be(:project) { create(:project, import_type: 'jira') } describe 'modules' do diff --git a/spec/workers/gitlab/jira_import/stage/start_import_worker_spec.rb b/spec/workers/gitlab/jira_import/stage/start_import_worker_spec.rb index a4fc761accf..7066e6e912f 100644 --- a/spec/workers/gitlab/jira_import/stage/start_import_worker_spec.rb +++ b/spec/workers/gitlab/jira_import/stage/start_import_worker_spec.rb @@ -2,7 +2,7 @@ require 'spec_helper' -describe Gitlab::JiraImport::Stage::StartImportWorker do +RSpec.describe Gitlab::JiraImport::Stage::StartImportWorker do let_it_be(:project) { create(:project, import_type: 'jira') } let_it_be(:jid) { '12345678' } let(:worker) { described_class.new } diff --git a/spec/workers/gitlab/jira_import/stuck_jira_import_jobs_worker_spec.rb b/spec/workers/gitlab/jira_import/stuck_jira_import_jobs_worker_spec.rb index fae52cec2b4..8271af4db2f 100644 --- a/spec/workers/gitlab/jira_import/stuck_jira_import_jobs_worker_spec.rb +++ b/spec/workers/gitlab/jira_import/stuck_jira_import_jobs_worker_spec.rb @@ -2,7 +2,7 @@ require 'spec_helper' -describe ::Gitlab::JiraImport::StuckJiraImportJobsWorker do +RSpec.describe ::Gitlab::JiraImport::StuckJiraImportJobsWorker do let_it_be(:current_user) { create(:user) } let_it_be(:project) { create(:project) } let(:worker) { described_class.new } diff --git a/spec/workers/gitlab/phabricator_import/base_worker_spec.rb b/spec/workers/gitlab/phabricator_import/base_worker_spec.rb index d46d908a3e3..18fa484aa7a 100644 --- a/spec/workers/gitlab/phabricator_import/base_worker_spec.rb +++ b/spec/workers/gitlab/phabricator_import/base_worker_spec.rb @@ -1,7 +1,7 @@ # frozen_string_literal: true require 'spec_helper' -describe Gitlab::PhabricatorImport::BaseWorker do +RSpec.describe Gitlab::PhabricatorImport::BaseWorker do let(:subclass) do # Creating an anonymous class for a worker is complicated, as we generate the # queue name from the class name. diff --git a/spec/workers/gitlab/phabricator_import/import_tasks_worker_spec.rb b/spec/workers/gitlab/phabricator_import/import_tasks_worker_spec.rb index 1e38ef8aaa5..221b6202166 100644 --- a/spec/workers/gitlab/phabricator_import/import_tasks_worker_spec.rb +++ b/spec/workers/gitlab/phabricator_import/import_tasks_worker_spec.rb @@ -1,7 +1,7 @@ # frozen_string_literal: true require 'spec_helper' -describe Gitlab::PhabricatorImport::ImportTasksWorker do +RSpec.describe Gitlab::PhabricatorImport::ImportTasksWorker do describe '#perform' do it 'calls the correct importer' do project = create(:project, :import_started, import_url: "https://the.phab.ulr") diff --git a/spec/workers/gitlab_shell_worker_spec.rb b/spec/workers/gitlab_shell_worker_spec.rb index 0e63f48d3e8..c46ef87333a 100644 --- a/spec/workers/gitlab_shell_worker_spec.rb +++ b/spec/workers/gitlab_shell_worker_spec.rb @@ -2,7 +2,7 @@ require 'spec_helper' -describe GitlabShellWorker do +RSpec.describe GitlabShellWorker do let(:worker) { described_class.new } describe '#perform' do diff --git a/spec/workers/gitlab_usage_ping_worker_spec.rb b/spec/workers/gitlab_usage_ping_worker_spec.rb index 198daf40493..05d6f2e585b 100644 --- a/spec/workers/gitlab_usage_ping_worker_spec.rb +++ b/spec/workers/gitlab_usage_ping_worker_spec.rb @@ -2,7 +2,7 @@ require 'spec_helper' -describe GitlabUsagePingWorker do +RSpec.describe GitlabUsagePingWorker do subject { described_class.new } it 'delegates to SubmitUsagePingService' do diff --git a/spec/workers/group_destroy_worker_spec.rb b/spec/workers/group_destroy_worker_spec.rb index 90a4150a31a..ab3dd19dec1 100644 --- a/spec/workers/group_destroy_worker_spec.rb +++ b/spec/workers/group_destroy_worker_spec.rb @@ -2,7 +2,7 @@ require 'spec_helper' -describe GroupDestroyWorker do +RSpec.describe GroupDestroyWorker do let(:group) { create(:group) } let(:user) { create(:admin) } let!(:project) { create(:project, namespace: group) } diff --git a/spec/workers/group_export_worker_spec.rb b/spec/workers/group_export_worker_spec.rb index 350777df912..5697e66b7d1 100644 --- a/spec/workers/group_export_worker_spec.rb +++ b/spec/workers/group_export_worker_spec.rb @@ -2,7 +2,7 @@ require 'spec_helper' -describe GroupExportWorker do +RSpec.describe GroupExportWorker do let!(:user) { create(:user) } let!(:group) { create(:group) } diff --git a/spec/workers/group_import_worker_spec.rb b/spec/workers/group_import_worker_spec.rb index 324a5fa6978..fb2d49c21af 100644 --- a/spec/workers/group_import_worker_spec.rb +++ b/spec/workers/group_import_worker_spec.rb @@ -2,7 +2,7 @@ require 'spec_helper' -describe GroupImportWorker do +RSpec.describe GroupImportWorker do let!(:user) { create(:user) } let!(:group) { create(:group) } diff --git a/spec/workers/hashed_storage/migrator_worker_spec.rb b/spec/workers/hashed_storage/migrator_worker_spec.rb index ac76a306f43..e014297756e 100644 --- a/spec/workers/hashed_storage/migrator_worker_spec.rb +++ b/spec/workers/hashed_storage/migrator_worker_spec.rb @@ -2,7 +2,7 @@ require 'spec_helper' -describe HashedStorage::MigratorWorker do +RSpec.describe HashedStorage::MigratorWorker do subject(:worker) { described_class.new } let(:projects) { create_list(:project, 2, :legacy_storage, :empty_repo) } diff --git a/spec/workers/hashed_storage/project_migrate_worker_spec.rb b/spec/workers/hashed_storage/project_migrate_worker_spec.rb index 4b1b5f84fd3..fd460888932 100644 --- a/spec/workers/hashed_storage/project_migrate_worker_spec.rb +++ b/spec/workers/hashed_storage/project_migrate_worker_spec.rb @@ -2,7 +2,7 @@ require 'spec_helper' -describe HashedStorage::ProjectMigrateWorker, :clean_gitlab_redis_shared_state do +RSpec.describe HashedStorage::ProjectMigrateWorker, :clean_gitlab_redis_shared_state do include ExclusiveLeaseHelpers let(:migration_service) { ::Projects::HashedStorage::MigrationService } diff --git a/spec/workers/hashed_storage/project_rollback_worker_spec.rb b/spec/workers/hashed_storage/project_rollback_worker_spec.rb index d833553c0ec..fc89ac728b1 100644 --- a/spec/workers/hashed_storage/project_rollback_worker_spec.rb +++ b/spec/workers/hashed_storage/project_rollback_worker_spec.rb @@ -2,7 +2,7 @@ require 'spec_helper' -describe HashedStorage::ProjectRollbackWorker, :clean_gitlab_redis_shared_state do +RSpec.describe HashedStorage::ProjectRollbackWorker, :clean_gitlab_redis_shared_state do include ExclusiveLeaseHelpers describe '#perform' do diff --git a/spec/workers/hashed_storage/rollbacker_worker_spec.rb b/spec/workers/hashed_storage/rollbacker_worker_spec.rb index 55fc4fb0fe1..46cca068273 100644 --- a/spec/workers/hashed_storage/rollbacker_worker_spec.rb +++ b/spec/workers/hashed_storage/rollbacker_worker_spec.rb @@ -2,7 +2,7 @@ require 'spec_helper' -describe HashedStorage::RollbackerWorker do +RSpec.describe HashedStorage::RollbackerWorker do subject(:worker) { described_class.new } let(:projects) { create_list(:project, 2, :empty_repo) } diff --git a/spec/workers/import_issues_csv_worker_spec.rb b/spec/workers/import_issues_csv_worker_spec.rb index 03944cfb05d..c5420b00e8a 100644 --- a/spec/workers/import_issues_csv_worker_spec.rb +++ b/spec/workers/import_issues_csv_worker_spec.rb @@ -2,7 +2,7 @@ require 'spec_helper' -describe ImportIssuesCsvWorker do +RSpec.describe ImportIssuesCsvWorker do let(:project) { create(:project) } let(:user) { create(:user) } let(:upload) { create(:upload) } diff --git a/spec/workers/incident_management/process_alert_worker_spec.rb b/spec/workers/incident_management/process_alert_worker_spec.rb index 0470552d933..ff138dd6885 100644 --- a/spec/workers/incident_management/process_alert_worker_spec.rb +++ b/spec/workers/incident_management/process_alert_worker_spec.rb @@ -2,7 +2,7 @@ require 'spec_helper' -describe IncidentManagement::ProcessAlertWorker do +RSpec.describe IncidentManagement::ProcessAlertWorker do let_it_be(:project) { create(:project) } let_it_be(:settings) { create(:project_incident_management_setting, project: project, create_issue: true) } diff --git a/spec/workers/incident_management/process_prometheus_alert_worker_spec.rb b/spec/workers/incident_management/process_prometheus_alert_worker_spec.rb index c9ea96df5c2..7cd3d6b2494 100644 --- a/spec/workers/incident_management/process_prometheus_alert_worker_spec.rb +++ b/spec/workers/incident_management/process_prometheus_alert_worker_spec.rb @@ -2,7 +2,7 @@ require 'spec_helper' -describe IncidentManagement::ProcessPrometheusAlertWorker do +RSpec.describe IncidentManagement::ProcessPrometheusAlertWorker do describe '#perform' do let_it_be(:project) { create(:project) } let_it_be(:prometheus_alert) { create(:prometheus_alert, project: project) } diff --git a/spec/workers/invalid_gpg_signature_update_worker_spec.rb b/spec/workers/invalid_gpg_signature_update_worker_spec.rb index 4f727469ea8..25c48b55cbb 100644 --- a/spec/workers/invalid_gpg_signature_update_worker_spec.rb +++ b/spec/workers/invalid_gpg_signature_update_worker_spec.rb @@ -2,7 +2,7 @@ require 'spec_helper' -describe InvalidGpgSignatureUpdateWorker do +RSpec.describe InvalidGpgSignatureUpdateWorker do context 'when GpgKey is found' do it 'calls NotificationService.new.run' do gpg_key = create(:gpg_key) diff --git a/spec/workers/issue_due_scheduler_worker_spec.rb b/spec/workers/issue_due_scheduler_worker_spec.rb index 61ad8330840..aecff4a3d93 100644 --- a/spec/workers/issue_due_scheduler_worker_spec.rb +++ b/spec/workers/issue_due_scheduler_worker_spec.rb @@ -2,7 +2,7 @@ require 'spec_helper' -describe IssueDueSchedulerWorker do +RSpec.describe IssueDueSchedulerWorker do describe '#perform' do it 'schedules one MailScheduler::IssueDueWorker per project with open issues due tomorrow' do project1 = create(:project) diff --git a/spec/workers/mail_scheduler/issue_due_worker_spec.rb b/spec/workers/mail_scheduler/issue_due_worker_spec.rb index fa17775e9f2..c03cc0bda61 100644 --- a/spec/workers/mail_scheduler/issue_due_worker_spec.rb +++ b/spec/workers/mail_scheduler/issue_due_worker_spec.rb @@ -2,7 +2,7 @@ require 'spec_helper' -describe MailScheduler::IssueDueWorker do +RSpec.describe MailScheduler::IssueDueWorker do describe '#perform' do let(:worker) { described_class.new } let(:project) { create(:project) } diff --git a/spec/workers/mail_scheduler/notification_service_worker_spec.rb b/spec/workers/mail_scheduler/notification_service_worker_spec.rb index ac95a6d7e43..ff4a1646d09 100644 --- a/spec/workers/mail_scheduler/notification_service_worker_spec.rb +++ b/spec/workers/mail_scheduler/notification_service_worker_spec.rb @@ -2,7 +2,7 @@ require 'spec_helper' -describe MailScheduler::NotificationServiceWorker do +RSpec.describe MailScheduler::NotificationServiceWorker do let(:worker) { described_class.new } let(:method) { 'new_key' } diff --git a/spec/workers/merge_request_mergeability_check_worker_spec.rb b/spec/workers/merge_request_mergeability_check_worker_spec.rb index 8909af1f685..0349de5cbb3 100644 --- a/spec/workers/merge_request_mergeability_check_worker_spec.rb +++ b/spec/workers/merge_request_mergeability_check_worker_spec.rb @@ -2,7 +2,7 @@ require 'spec_helper' -describe MergeRequestMergeabilityCheckWorker do +RSpec.describe MergeRequestMergeabilityCheckWorker do subject { described_class.new } describe '#perform' do diff --git a/spec/workers/merge_worker_spec.rb b/spec/workers/merge_worker_spec.rb index dc98c9836fa..97e8aeb616e 100644 --- a/spec/workers/merge_worker_spec.rb +++ b/spec/workers/merge_worker_spec.rb @@ -2,7 +2,7 @@ require 'spec_helper' -describe MergeWorker do +RSpec.describe MergeWorker do describe "remove source branch" do let!(:merge_request) { create(:merge_request, source_branch: "markdown") } let!(:source_project) { merge_request.source_project } diff --git a/spec/workers/metrics/dashboard/schedule_annotations_prune_worker_spec.rb b/spec/workers/metrics/dashboard/schedule_annotations_prune_worker_spec.rb index bfe6fe3a90e..e0a5a8fd448 100644 --- a/spec/workers/metrics/dashboard/schedule_annotations_prune_worker_spec.rb +++ b/spec/workers/metrics/dashboard/schedule_annotations_prune_worker_spec.rb @@ -2,7 +2,7 @@ require 'spec_helper' -describe Metrics::Dashboard::ScheduleAnnotationsPruneWorker do +RSpec.describe Metrics::Dashboard::ScheduleAnnotationsPruneWorker do describe '#perform' do it 'schedules annotations prune job with default cut off date' do expect(Metrics::Dashboard::PruneOldAnnotationsWorker).to receive(:perform_async) diff --git a/spec/workers/migrate_external_diffs_worker_spec.rb b/spec/workers/migrate_external_diffs_worker_spec.rb index 88d48cad14b..86d4680acbe 100644 --- a/spec/workers/migrate_external_diffs_worker_spec.rb +++ b/spec/workers/migrate_external_diffs_worker_spec.rb @@ -2,7 +2,7 @@ require 'spec_helper' -describe MigrateExternalDiffsWorker do +RSpec.describe MigrateExternalDiffsWorker do let(:worker) { described_class.new } let(:diff) { create(:merge_request).merge_request_diff } diff --git a/spec/workers/namespaceless_project_destroy_worker_spec.rb b/spec/workers/namespaceless_project_destroy_worker_spec.rb index ceea7c8d8f5..ef396bc7fbb 100644 --- a/spec/workers/namespaceless_project_destroy_worker_spec.rb +++ b/spec/workers/namespaceless_project_destroy_worker_spec.rb @@ -2,7 +2,7 @@ require 'spec_helper' -describe NamespacelessProjectDestroyWorker do +RSpec.describe NamespacelessProjectDestroyWorker do include ProjectForksHelper subject { described_class.new } diff --git a/spec/workers/namespaces/prune_aggregation_schedules_worker_spec.rb b/spec/workers/namespaces/prune_aggregation_schedules_worker_spec.rb index b069b080531..11f2501cbe3 100644 --- a/spec/workers/namespaces/prune_aggregation_schedules_worker_spec.rb +++ b/spec/workers/namespaces/prune_aggregation_schedules_worker_spec.rb @@ -2,7 +2,7 @@ require 'spec_helper' -describe Namespaces::PruneAggregationSchedulesWorker, '#perform', :clean_gitlab_redis_shared_state do +RSpec.describe Namespaces::PruneAggregationSchedulesWorker, '#perform', :clean_gitlab_redis_shared_state do include ExclusiveLeaseHelpers let(:namespaces) { create_list(:namespace, 5, :with_aggregation_schedule) } diff --git a/spec/workers/namespaces/root_statistics_worker_spec.rb b/spec/workers/namespaces/root_statistics_worker_spec.rb index 910a5b23e17..0c6e3e89973 100644 --- a/spec/workers/namespaces/root_statistics_worker_spec.rb +++ b/spec/workers/namespaces/root_statistics_worker_spec.rb @@ -2,7 +2,7 @@ require 'spec_helper' -describe Namespaces::RootStatisticsWorker, '#perform' do +RSpec.describe Namespaces::RootStatisticsWorker, '#perform' do let(:group) { create(:group, :with_aggregation_schedule) } subject(:worker) { described_class.new } diff --git a/spec/workers/namespaces/schedule_aggregation_worker_spec.rb b/spec/workers/namespaces/schedule_aggregation_worker_spec.rb index 2f4c7f8bc07..f2fe53d6112 100644 --- a/spec/workers/namespaces/schedule_aggregation_worker_spec.rb +++ b/spec/workers/namespaces/schedule_aggregation_worker_spec.rb @@ -2,7 +2,7 @@ require 'spec_helper' -describe Namespaces::ScheduleAggregationWorker, '#perform', :clean_gitlab_redis_shared_state do +RSpec.describe Namespaces::ScheduleAggregationWorker, '#perform', :clean_gitlab_redis_shared_state do let(:group) { create(:group) } subject(:worker) { described_class.new } diff --git a/spec/workers/new_issue_worker_spec.rb b/spec/workers/new_issue_worker_spec.rb index 1584e9d5302..6386af8d253 100644 --- a/spec/workers/new_issue_worker_spec.rb +++ b/spec/workers/new_issue_worker_spec.rb @@ -2,7 +2,7 @@ require 'spec_helper' -describe NewIssueWorker do +RSpec.describe NewIssueWorker do describe '#perform' do let(:worker) { described_class.new } diff --git a/spec/workers/new_merge_request_worker_spec.rb b/spec/workers/new_merge_request_worker_spec.rb index fe22226903f..37449540db5 100644 --- a/spec/workers/new_merge_request_worker_spec.rb +++ b/spec/workers/new_merge_request_worker_spec.rb @@ -2,7 +2,7 @@ require 'spec_helper' -describe NewMergeRequestWorker do +RSpec.describe NewMergeRequestWorker do describe '#perform' do let(:worker) { described_class.new } diff --git a/spec/workers/new_note_worker_spec.rb b/spec/workers/new_note_worker_spec.rb index 57269355180..21f10fa5bfb 100644 --- a/spec/workers/new_note_worker_spec.rb +++ b/spec/workers/new_note_worker_spec.rb @@ -2,7 +2,7 @@ require "spec_helper" -describe NewNoteWorker do +RSpec.describe NewNoteWorker do context 'when Note found' do let(:note) { create(:note) } diff --git a/spec/workers/new_release_worker_spec.rb b/spec/workers/new_release_worker_spec.rb index de4e1bac48f..1c9953c0154 100644 --- a/spec/workers/new_release_worker_spec.rb +++ b/spec/workers/new_release_worker_spec.rb @@ -4,7 +4,7 @@ # https://gitlab.com/gitlab-org/gitlab/-/issues/218231 require 'spec_helper' -describe NewReleaseWorker do +RSpec.describe NewReleaseWorker do let(:release) { create(:release) } it 'sends a new release notification' do diff --git a/spec/workers/object_pool/create_worker_spec.rb b/spec/workers/object_pool/create_worker_spec.rb index 06416489472..4ec409bdf47 100644 --- a/spec/workers/object_pool/create_worker_spec.rb +++ b/spec/workers/object_pool/create_worker_spec.rb @@ -2,7 +2,7 @@ require 'spec_helper' -describe ObjectPool::CreateWorker do +RSpec.describe ObjectPool::CreateWorker do let(:pool) { create(:pool_repository, :scheduled) } subject { described_class.new } diff --git a/spec/workers/object_pool/destroy_worker_spec.rb b/spec/workers/object_pool/destroy_worker_spec.rb index 52d457b4b71..130a666a42e 100644 --- a/spec/workers/object_pool/destroy_worker_spec.rb +++ b/spec/workers/object_pool/destroy_worker_spec.rb @@ -1,6 +1,6 @@ # frozen_string_literal: true -describe ObjectPool::DestroyWorker do +RSpec.describe ObjectPool::DestroyWorker do describe '#perform' do context 'when no pool is in the database' do it "doesn't raise an error" do diff --git a/spec/workers/object_pool/join_worker_spec.rb b/spec/workers/object_pool/join_worker_spec.rb index 906bc22c8d2..335c45e14e0 100644 --- a/spec/workers/object_pool/join_worker_spec.rb +++ b/spec/workers/object_pool/join_worker_spec.rb @@ -2,7 +2,7 @@ require 'spec_helper' -describe ObjectPool::JoinWorker do +RSpec.describe ObjectPool::JoinWorker do let(:pool) { create(:pool_repository, :ready) } let(:project) { pool.source_project } let(:repository) { project.repository } diff --git a/spec/workers/pages_domain_removal_cron_worker_spec.rb b/spec/workers/pages_domain_removal_cron_worker_spec.rb index 2408ad54189..f152d019de6 100644 --- a/spec/workers/pages_domain_removal_cron_worker_spec.rb +++ b/spec/workers/pages_domain_removal_cron_worker_spec.rb @@ -2,7 +2,7 @@ require 'spec_helper' -describe PagesDomainRemovalCronWorker do +RSpec.describe PagesDomainRemovalCronWorker do subject(:worker) { described_class.new } describe '#perform' do diff --git a/spec/workers/pages_domain_ssl_renewal_cron_worker_spec.rb b/spec/workers/pages_domain_ssl_renewal_cron_worker_spec.rb index 1349a80029b..7c745e51df5 100644 --- a/spec/workers/pages_domain_ssl_renewal_cron_worker_spec.rb +++ b/spec/workers/pages_domain_ssl_renewal_cron_worker_spec.rb @@ -2,7 +2,7 @@ require 'spec_helper' -describe PagesDomainSslRenewalCronWorker do +RSpec.describe PagesDomainSslRenewalCronWorker do include LetsEncryptHelpers subject(:worker) { described_class.new } diff --git a/spec/workers/pages_domain_ssl_renewal_worker_spec.rb b/spec/workers/pages_domain_ssl_renewal_worker_spec.rb index a35965f49b2..f8149b23a08 100644 --- a/spec/workers/pages_domain_ssl_renewal_worker_spec.rb +++ b/spec/workers/pages_domain_ssl_renewal_worker_spec.rb @@ -2,7 +2,7 @@ require 'spec_helper' -describe PagesDomainSslRenewalWorker do +RSpec.describe PagesDomainSslRenewalWorker do include LetsEncryptHelpers subject(:worker) { described_class.new } diff --git a/spec/workers/pages_domain_verification_cron_worker_spec.rb b/spec/workers/pages_domain_verification_cron_worker_spec.rb index 6dd6c33f5fe..01eaf984c90 100644 --- a/spec/workers/pages_domain_verification_cron_worker_spec.rb +++ b/spec/workers/pages_domain_verification_cron_worker_spec.rb @@ -2,7 +2,7 @@ require 'spec_helper' -describe PagesDomainVerificationCronWorker do +RSpec.describe PagesDomainVerificationCronWorker do subject(:worker) { described_class.new } describe '#perform', :sidekiq do diff --git a/spec/workers/pages_domain_verification_worker_spec.rb b/spec/workers/pages_domain_verification_worker_spec.rb index f51ac1f4323..74b9730f7c1 100644 --- a/spec/workers/pages_domain_verification_worker_spec.rb +++ b/spec/workers/pages_domain_verification_worker_spec.rb @@ -2,7 +2,7 @@ require 'spec_helper' -describe PagesDomainVerificationWorker do +RSpec.describe PagesDomainVerificationWorker do subject(:worker) { described_class.new } let(:domain) { create(:pages_domain) } diff --git a/spec/workers/pipeline_hooks_worker_spec.rb b/spec/workers/pipeline_hooks_worker_spec.rb index 60df08f40da..7c75cdc8823 100644 --- a/spec/workers/pipeline_hooks_worker_spec.rb +++ b/spec/workers/pipeline_hooks_worker_spec.rb @@ -2,7 +2,7 @@ require 'spec_helper' -describe PipelineHooksWorker do +RSpec.describe PipelineHooksWorker do describe '#perform' do context 'when pipeline exists' do let(:pipeline) { create(:ci_pipeline) } diff --git a/spec/workers/pipeline_metrics_worker_spec.rb b/spec/workers/pipeline_metrics_worker_spec.rb index e12cd0ea1e9..c73b84e26a6 100644 --- a/spec/workers/pipeline_metrics_worker_spec.rb +++ b/spec/workers/pipeline_metrics_worker_spec.rb @@ -2,7 +2,7 @@ require 'spec_helper' -describe PipelineMetricsWorker do +RSpec.describe PipelineMetricsWorker do let(:project) { create(:project, :repository) } let!(:merge_request) do diff --git a/spec/workers/pipeline_notification_worker_spec.rb b/spec/workers/pipeline_notification_worker_spec.rb index f2cc2b56236..9a15864173c 100644 --- a/spec/workers/pipeline_notification_worker_spec.rb +++ b/spec/workers/pipeline_notification_worker_spec.rb @@ -2,7 +2,7 @@ require 'spec_helper' -describe PipelineNotificationWorker, :mailer do +RSpec.describe PipelineNotificationWorker, :mailer do let_it_be(:pipeline) { create(:ci_pipeline) } describe '#execute' do diff --git a/spec/workers/pipeline_process_worker_spec.rb b/spec/workers/pipeline_process_worker_spec.rb index 8260d7ac320..a6e6b505a38 100644 --- a/spec/workers/pipeline_process_worker_spec.rb +++ b/spec/workers/pipeline_process_worker_spec.rb @@ -2,7 +2,7 @@ require 'spec_helper' -describe PipelineProcessWorker do +RSpec.describe PipelineProcessWorker do describe '#perform' do context 'when pipeline exists' do let(:pipeline) { create(:ci_pipeline) } diff --git a/spec/workers/pipeline_schedule_worker_spec.rb b/spec/workers/pipeline_schedule_worker_spec.rb index ba52828b761..f59d8ad4615 100644 --- a/spec/workers/pipeline_schedule_worker_spec.rb +++ b/spec/workers/pipeline_schedule_worker_spec.rb @@ -2,7 +2,7 @@ require 'spec_helper' -describe PipelineScheduleWorker do +RSpec.describe PipelineScheduleWorker do include ExclusiveLeaseHelpers subject { described_class.new.perform } diff --git a/spec/workers/pipeline_update_ci_ref_status_worker_service_spec.rb b/spec/workers/pipeline_update_ci_ref_status_worker_service_spec.rb index 3fe8aa55142..4e7af16c63d 100644 --- a/spec/workers/pipeline_update_ci_ref_status_worker_service_spec.rb +++ b/spec/workers/pipeline_update_ci_ref_status_worker_service_spec.rb @@ -3,7 +3,7 @@ require 'spec_helper' # NOTE: This class is unused and to be removed in 13.1~ -describe PipelineUpdateCiRefStatusWorker do +RSpec.describe PipelineUpdateCiRefStatusWorker do let(:worker) { described_class.new } let(:pipeline) { create(:ci_pipeline) } diff --git a/spec/workers/pipeline_update_worker_spec.rb b/spec/workers/pipeline_update_worker_spec.rb index 187298034cc..72280ebfb01 100644 --- a/spec/workers/pipeline_update_worker_spec.rb +++ b/spec/workers/pipeline_update_worker_spec.rb @@ -2,7 +2,7 @@ require 'spec_helper' -describe PipelineUpdateWorker do +RSpec.describe PipelineUpdateWorker do describe '#perform' do context 'when pipeline exists' do let(:pipeline) { create(:ci_pipeline) } diff --git a/spec/workers/post_receive_spec.rb b/spec/workers/post_receive_spec.rb index 18e06332eb3..0b9ace3db87 100644 --- a/spec/workers/post_receive_spec.rb +++ b/spec/workers/post_receive_spec.rb @@ -2,7 +2,7 @@ require 'spec_helper' -describe PostReceive do +RSpec.describe PostReceive do let(:changes) { "123456 789012 refs/heads/tést\n654321 210987 refs/tags/tag" } let(:wrongly_encoded_changes) { changes.encode("ISO-8859-1").force_encoding("UTF-8") } let(:base64_changes) { Base64.encode64(wrongly_encoded_changes) } diff --git a/spec/workers/process_commit_worker_spec.rb b/spec/workers/process_commit_worker_spec.rb index 5cdb9836069..a33ee6e1da5 100644 --- a/spec/workers/process_commit_worker_spec.rb +++ b/spec/workers/process_commit_worker_spec.rb @@ -2,7 +2,7 @@ require 'spec_helper' -describe ProcessCommitWorker do +RSpec.describe ProcessCommitWorker do let(:worker) { described_class.new } let(:user) { create(:user) } let(:project) { create(:project, :public, :repository) } diff --git a/spec/workers/project_cache_worker_spec.rb b/spec/workers/project_cache_worker_spec.rb index fa02762d716..0f91f7af255 100644 --- a/spec/workers/project_cache_worker_spec.rb +++ b/spec/workers/project_cache_worker_spec.rb @@ -2,7 +2,7 @@ require 'spec_helper' -describe ProjectCacheWorker do +RSpec.describe ProjectCacheWorker do include ExclusiveLeaseHelpers let(:worker) { described_class.new } diff --git a/spec/workers/project_daily_statistics_worker_spec.rb b/spec/workers/project_daily_statistics_worker_spec.rb index 8640add99e5..fa9d938acca 100644 --- a/spec/workers/project_daily_statistics_worker_spec.rb +++ b/spec/workers/project_daily_statistics_worker_spec.rb @@ -1,7 +1,7 @@ # frozen_string_literal: true require 'spec_helper' -describe ProjectDailyStatisticsWorker, '#perform' do +RSpec.describe ProjectDailyStatisticsWorker, '#perform' do let(:worker) { described_class.new } let(:project) { create(:project) } diff --git a/spec/workers/project_destroy_worker_spec.rb b/spec/workers/project_destroy_worker_spec.rb index ec40900a5b7..00a4ddac29f 100644 --- a/spec/workers/project_destroy_worker_spec.rb +++ b/spec/workers/project_destroy_worker_spec.rb @@ -2,7 +2,7 @@ require 'spec_helper' -describe ProjectDestroyWorker do +RSpec.describe ProjectDestroyWorker do let(:project) { create(:project, :repository, pending_delete: true) } let(:path) do Gitlab::GitalyClient::StorageSettings.allow_disk_access do diff --git a/spec/workers/project_export_worker_spec.rb b/spec/workers/project_export_worker_spec.rb index 4c49939d34e..a9ba0b606e9 100644 --- a/spec/workers/project_export_worker_spec.rb +++ b/spec/workers/project_export_worker_spec.rb @@ -2,7 +2,7 @@ require 'spec_helper' -describe ProjectExportWorker do +RSpec.describe ProjectExportWorker do let!(:user) { create(:user) } let!(:project) { create(:project) } diff --git a/spec/workers/project_service_worker_spec.rb b/spec/workers/project_service_worker_spec.rb index 56934f122e4..c638b7472ff 100644 --- a/spec/workers/project_service_worker_spec.rb +++ b/spec/workers/project_service_worker_spec.rb @@ -1,7 +1,7 @@ # frozen_string_literal: true require 'spec_helper' -describe ProjectServiceWorker, '#perform' do +RSpec.describe ProjectServiceWorker, '#perform' do let(:worker) { described_class.new } let(:service) { JiraService.new } diff --git a/spec/workers/project_update_repository_storage_worker_spec.rb b/spec/workers/project_update_repository_storage_worker_spec.rb index 98856480b21..828a75e15c5 100644 --- a/spec/workers/project_update_repository_storage_worker_spec.rb +++ b/spec/workers/project_update_repository_storage_worker_spec.rb @@ -3,7 +3,7 @@ require 'spec_helper' require 'securerandom' -describe ProjectUpdateRepositoryStorageWorker do +RSpec.describe ProjectUpdateRepositoryStorageWorker do let(:project) { create(:project, :repository) } subject { described_class.new } diff --git a/spec/workers/prometheus/create_default_alerts_worker_spec.rb b/spec/workers/prometheus/create_default_alerts_worker_spec.rb index 1b1867d5bb6..105fa0415d9 100644 --- a/spec/workers/prometheus/create_default_alerts_worker_spec.rb +++ b/spec/workers/prometheus/create_default_alerts_worker_spec.rb @@ -2,7 +2,7 @@ require 'spec_helper' -describe Prometheus::CreateDefaultAlertsWorker do +RSpec.describe Prometheus::CreateDefaultAlertsWorker do let_it_be(:project) { create(:project) } let(:worker) { described_class.new } let(:logger) { worker.send(:logger) } diff --git a/spec/workers/propagate_integration_worker_spec.rb b/spec/workers/propagate_integration_worker_spec.rb index e49869a38e9..a0fdd37b3c0 100644 --- a/spec/workers/propagate_integration_worker_spec.rb +++ b/spec/workers/propagate_integration_worker_spec.rb @@ -2,7 +2,7 @@ require 'spec_helper' -describe PropagateIntegrationWorker do +RSpec.describe PropagateIntegrationWorker do describe '#perform' do let(:integration) do PushoverService.create( diff --git a/spec/workers/propagate_service_template_worker_spec.rb b/spec/workers/propagate_service_template_worker_spec.rb index fb4ced77832..4cba313a23f 100644 --- a/spec/workers/propagate_service_template_worker_spec.rb +++ b/spec/workers/propagate_service_template_worker_spec.rb @@ -2,7 +2,7 @@ require 'spec_helper' -describe PropagateServiceTemplateWorker do +RSpec.describe PropagateServiceTemplateWorker do include ExclusiveLeaseHelpers describe '#perform' do diff --git a/spec/workers/prune_old_events_worker_spec.rb b/spec/workers/prune_old_events_worker_spec.rb index 14235bde070..c1ba9128475 100644 --- a/spec/workers/prune_old_events_worker_spec.rb +++ b/spec/workers/prune_old_events_worker_spec.rb @@ -2,7 +2,7 @@ require 'spec_helper' -describe PruneOldEventsWorker do +RSpec.describe PruneOldEventsWorker do describe '#perform' do let(:user) { create(:user) } diff --git a/spec/workers/prune_web_hook_logs_worker_spec.rb b/spec/workers/prune_web_hook_logs_worker_spec.rb index e57334967fd..6cd7a54ac7a 100644 --- a/spec/workers/prune_web_hook_logs_worker_spec.rb +++ b/spec/workers/prune_web_hook_logs_worker_spec.rb @@ -2,7 +2,7 @@ require 'spec_helper' -describe PruneWebHookLogsWorker do +RSpec.describe PruneWebHookLogsWorker do describe '#perform' do before do hook = create(:project_hook) diff --git a/spec/workers/reactive_caching_worker_spec.rb b/spec/workers/reactive_caching_worker_spec.rb index dcb804a7e6e..63b26817a7a 100644 --- a/spec/workers/reactive_caching_worker_spec.rb +++ b/spec/workers/reactive_caching_worker_spec.rb @@ -2,6 +2,6 @@ require 'spec_helper' -describe ReactiveCachingWorker do +RSpec.describe ReactiveCachingWorker do it_behaves_like 'reactive cacheable worker' end diff --git a/spec/workers/rebase_worker_spec.rb b/spec/workers/rebase_worker_spec.rb index 578b8cf7451..9246b283be5 100644 --- a/spec/workers/rebase_worker_spec.rb +++ b/spec/workers/rebase_worker_spec.rb @@ -2,7 +2,7 @@ require 'spec_helper' -describe RebaseWorker, '#perform' do +RSpec.describe RebaseWorker, '#perform' do include ProjectForksHelper context 'when rebasing an MR from a fork where upstream has protected branches' do diff --git a/spec/workers/remote_mirror_notification_worker_spec.rb b/spec/workers/remote_mirror_notification_worker_spec.rb index f0fb46f84d9..c6fd614fdea 100644 --- a/spec/workers/remote_mirror_notification_worker_spec.rb +++ b/spec/workers/remote_mirror_notification_worker_spec.rb @@ -2,7 +2,7 @@ require 'spec_helper' -describe RemoteMirrorNotificationWorker, :mailer do +RSpec.describe RemoteMirrorNotificationWorker, :mailer do let_it_be(:project) { create(:project, :repository, :remote_mirror) } let_it_be(:mirror) { project.remote_mirrors.first } |