diff options
Diffstat (limited to 'spec')
-rw-r--r-- | spec/factories/groups.rb | 6 | ||||
-rw-r--r-- | spec/factories/wikis.rb | 4 | ||||
-rw-r--r-- | spec/features/groups/members/leave_group_spec.rb | 2 | ||||
-rw-r--r-- | spec/frontend/registry/explorer/pages/details_spec.js | 150 | ||||
-rw-r--r-- | spec/frontend/registry/explorer/pages/index_spec.js | 36 | ||||
-rw-r--r-- | spec/frontend/registry/explorer/stores/actions_spec.js | 20 | ||||
-rw-r--r-- | spec/lib/gitlab/metrics/samplers/ruby_sampler_spec.rb | 17 | ||||
-rw-r--r-- | spec/lib/gitlab/metrics/system_spec.rb | 113 | ||||
-rw-r--r-- | spec/lib/gitlab/repository_url_builder_spec.rb | 1 | ||||
-rw-r--r-- | spec/lib/gitlab/static_site_editor/config_spec.rb | 18 | ||||
-rw-r--r-- | spec/lib/gitlab/url_builder_spec.rb | 1 | ||||
-rw-r--r-- | spec/models/group_spec.rb | 5 | ||||
-rw-r--r-- | spec/models/group_wiki_spec.rb | 38 | ||||
-rw-r--r-- | spec/models/wiki_page_spec.rb | 31 |
14 files changed, 253 insertions, 189 deletions
diff --git a/spec/factories/groups.rb b/spec/factories/groups.rb index 6d292d529ab..4b6c1756d1e 100644 --- a/spec/factories/groups.rb +++ b/spec/factories/groups.rb @@ -51,11 +51,5 @@ FactoryBot.define do trait :owner_subgroup_creation_only do subgroup_creation_level { ::Gitlab::Access::OWNER_SUBGROUP_ACCESS} end - - trait :wiki_repo do - after(:create) do |group| - raise 'Failed to create wiki repository!' unless group.create_wiki - end - end end end diff --git a/spec/factories/wikis.rb b/spec/factories/wikis.rb index b591b0f169d..96578fdcee6 100644 --- a/spec/factories/wikis.rb +++ b/spec/factories/wikis.rb @@ -17,9 +17,5 @@ FactoryBot.define do container { project } end - - factory :group_wiki do - container { association(:group, :wiki_repo) } - end end end diff --git a/spec/features/groups/members/leave_group_spec.rb b/spec/features/groups/members/leave_group_spec.rb index df15f995be4..5c7c83aea6d 100644 --- a/spec/features/groups/members/leave_group_spec.rb +++ b/spec/features/groups/members/leave_group_spec.rb @@ -31,8 +31,6 @@ describe 'Groups > Members > Leave group' do page.accept_confirm - expect(find('.flash-notice')).to have_content "You left the \"#{group.full_name}\" group" - expect(page).to have_content left_group_message(group) expect(current_path).to eq(dashboard_groups_path) expect(group.users).not_to include(user) end diff --git a/spec/frontend/registry/explorer/pages/details_spec.js b/spec/frontend/registry/explorer/pages/details_spec.js index 15aa5008413..d6741aa3141 100644 --- a/spec/frontend/registry/explorer/pages/details_spec.js +++ b/spec/frontend/registry/explorer/pages/details_spec.js @@ -1,15 +1,16 @@ import { mount } from '@vue/test-utils'; -import { GlTable, GlPagination, GlSkeletonLoader } from '@gitlab/ui'; +import { GlTable, GlPagination, GlSkeletonLoader, GlAlert, GlLink } from '@gitlab/ui'; import Tracking from '~/tracking'; import stubChildren from 'helpers/stub_children'; import component from '~/registry/explorer/pages/details.vue'; -import store from '~/registry/explorer/stores/'; -import { SET_MAIN_LOADING } from '~/registry/explorer/stores/mutation_types/'; +import { createStore } from '~/registry/explorer/stores/'; +import { SET_MAIN_LOADING, SET_INITIAL_STATE } from '~/registry/explorer/stores/mutation_types/'; import { DELETE_TAG_SUCCESS_MESSAGE, DELETE_TAG_ERROR_MESSAGE, DELETE_TAGS_SUCCESS_MESSAGE, DELETE_TAGS_ERROR_MESSAGE, + ADMIN_GARBAGE_COLLECTION_TIP, } from '~/registry/explorer/constants'; import { tagsListResponse } from '../mock_data'; import { GlModal } from '../stubs'; @@ -18,6 +19,7 @@ import { $toast } from '../../shared/mocks'; describe('Details Page', () => { let wrapper; let dispatchSpy; + let store; const findDeleteModal = () => wrapper.find(GlModal); const findPagination = () => wrapper.find(GlPagination); @@ -30,6 +32,7 @@ describe('Details Page', () => { const findAllCheckboxes = () => wrapper.findAll('.js-row-checkbox'); const findCheckedCheckboxes = () => findAllCheckboxes().filter(c => c.attributes('checked')); const findFirsTagColumn = () => wrapper.find('.js-tag-column'); + const findAlert = () => wrapper.find(GlAlert); const routeId = window.btoa(JSON.stringify({ name: 'foo', tags_path: 'bar' })); @@ -55,6 +58,7 @@ describe('Details Page', () => { }; beforeEach(() => { + store = createStore(); dispatchSpy = jest.spyOn(store, 'dispatch'); store.dispatch('receiveTagsListSuccess', tagsListResponse); jest.spyOn(Tracking, 'event'); @@ -62,6 +66,7 @@ describe('Details Page', () => { afterEach(() => { wrapper.destroy(); + wrapper = null; }); describe('when isLoading is true', () => { @@ -328,25 +333,9 @@ describe('Details Page', () => { }); // itemsToBeDeleted is not represented in the DOM, is used as parking variable between selected and deleted items expect(wrapper.vm.itemsToBeDeleted).toEqual([]); + expect(wrapper.vm.selectedItems).toEqual([]); expect(findCheckedCheckboxes()).toHaveLength(0); }); - - it('show success toast on successful delete', () => { - return wrapper.vm.handleSingleDelete(0).then(() => { - expect(wrapper.vm.$toast.show).toHaveBeenCalledWith(DELETE_TAG_SUCCESS_MESSAGE, { - type: 'success', - }); - }); - }); - - it('show error toast on erred delete', () => { - dispatchSpy.mockRejectedValue(); - return wrapper.vm.handleSingleDelete(0).then(() => { - expect(wrapper.vm.$toast.show).toHaveBeenCalledWith(DELETE_TAG_ERROR_MESSAGE, { - type: 'error', - }); - }); - }); }); describe('when multiple elements are selected', () => { @@ -365,23 +354,6 @@ describe('Details Page', () => { expect(wrapper.vm.itemsToBeDeleted).toEqual([]); expect(findCheckedCheckboxes()).toHaveLength(0); }); - - it('show success toast on successful delete', () => { - return wrapper.vm.handleMultipleDelete(0).then(() => { - expect(wrapper.vm.$toast.show).toHaveBeenCalledWith(DELETE_TAGS_SUCCESS_MESSAGE, { - type: 'success', - }); - }); - }); - - it('show error toast on erred delete', () => { - dispatchSpy.mockRejectedValue(); - return wrapper.vm.handleMultipleDelete(0).then(() => { - expect(wrapper.vm.$toast.show).toHaveBeenCalledWith(DELETE_TAGS_ERROR_MESSAGE, { - type: 'error', - }); - }); - }); }); }); @@ -395,4 +367,108 @@ describe('Details Page', () => { }); }); }); + + describe('Delete alert', () => { + const config = { + garbageCollectionHelpPagePath: 'foo', + }; + + describe('when the user is an admin', () => { + beforeEach(() => { + store.commit(SET_INITIAL_STATE, { ...config, isAdmin: true }); + }); + + afterEach(() => { + store.commit(SET_INITIAL_STATE, config); + }); + + describe.each` + deleteType | successTitle | errorTitle + ${'handleSingleDelete'} | ${DELETE_TAG_SUCCESS_MESSAGE} | ${DELETE_TAG_ERROR_MESSAGE} + ${'handleMultipleDelete'} | ${DELETE_TAGS_SUCCESS_MESSAGE} | ${DELETE_TAGS_ERROR_MESSAGE} + `('behaves correctly on $deleteType', ({ deleteType, successTitle, errorTitle }) => { + describe('when delete is successful', () => { + beforeEach(() => { + dispatchSpy.mockResolvedValue(); + mountComponent(); + return wrapper.vm[deleteType]('foo'); + }); + + it('alert exists', () => { + expect(findAlert().exists()).toBe(true); + }); + + it('alert body contains admin tip', () => { + expect( + findAlert() + .text() + .replace(/\s\s+/gm, ' '), + ).toBe(ADMIN_GARBAGE_COLLECTION_TIP.replace(/%{\w+}/gm, '')); + }); + + it('alert body contains link', () => { + const alertLink = findAlert().find(GlLink); + expect(alertLink.exists()).toBe(true); + expect(alertLink.attributes('href')).toBe(config.garbageCollectionHelpPagePath); + }); + + it('alert title is appropriate', () => { + expect(findAlert().attributes('title')).toBe(successTitle); + }); + }); + + describe('when delete is not successful', () => { + beforeEach(() => { + mountComponent(); + dispatchSpy.mockRejectedValue(); + return wrapper.vm[deleteType]('foo'); + }); + + it('alert exist and text is appropriate', () => { + expect(findAlert().exists()).toBe(true); + expect(findAlert().text()).toBe(errorTitle); + }); + }); + }); + }); + + describe.each` + deleteType | successTitle | errorTitle + ${'handleSingleDelete'} | ${DELETE_TAG_SUCCESS_MESSAGE} | ${DELETE_TAG_ERROR_MESSAGE} + ${'handleMultipleDelete'} | ${DELETE_TAGS_SUCCESS_MESSAGE} | ${DELETE_TAGS_ERROR_MESSAGE} + `( + 'when the user is not an admin alert behaves correctly on $deleteType', + ({ deleteType, successTitle, errorTitle }) => { + beforeEach(() => { + store.commit('SET_INITIAL_STATE', { ...config }); + }); + + describe('when delete is successful', () => { + beforeEach(() => { + dispatchSpy.mockResolvedValue(); + mountComponent(); + return wrapper.vm[deleteType]('foo'); + }); + + it('alert exist and text is appropriate', () => { + expect(findAlert().exists()).toBe(true); + expect(findAlert().text()).toBe(successTitle); + }); + }); + + describe('when delete is not successful', () => { + beforeEach(() => { + mountComponent(); + dispatchSpy.mockRejectedValue(); + return wrapper.vm[deleteType]('foo'); + }); + + it('alert exist and text is appropriate', () => { + expect(findAlert().exists()).toBe(true); + expect(findAlert().text()).toBe(errorTitle); + }); + }); + }, + ); + }); }); diff --git a/spec/frontend/registry/explorer/pages/index_spec.js b/spec/frontend/registry/explorer/pages/index_spec.js index f52e7d67866..b558727ed5e 100644 --- a/spec/frontend/registry/explorer/pages/index_spec.js +++ b/spec/frontend/registry/explorer/pages/index_spec.js @@ -1,62 +1,26 @@ import { shallowMount } from '@vue/test-utils'; -import { GlAlert, GlSprintf, GlLink } from '@gitlab/ui'; import component from '~/registry/explorer/pages/index.vue'; import store from '~/registry/explorer/stores/'; describe('List Page', () => { let wrapper; - let dispatchSpy; const findRouterView = () => wrapper.find({ ref: 'router-view' }); - const findAlert = () => wrapper.find(GlAlert); - const findLink = () => wrapper.find(GlLink); const mountComponent = () => { wrapper = shallowMount(component, { store, stubs: { RouterView: true, - GlSprintf, }, }); }; beforeEach(() => { - dispatchSpy = jest.spyOn(store, 'dispatch'); mountComponent(); }); it('has a router view', () => { expect(findRouterView().exists()).toBe(true); }); - - describe('garbageCollectionTip alert', () => { - beforeEach(() => { - store.dispatch('setInitialState', { isAdmin: true, garbageCollectionHelpPagePath: 'foo' }); - store.dispatch('setShowGarbageCollectionTip', true); - }); - - afterEach(() => { - store.dispatch('setInitialState', {}); - store.dispatch('setShowGarbageCollectionTip', false); - }); - - it('is visible when the user is an admin and the user performed a delete action', () => { - expect(findAlert().exists()).toBe(true); - }); - - it('on dismiss disappears ', () => { - findAlert().vm.$emit('dismiss'); - expect(dispatchSpy).toHaveBeenCalledWith('setShowGarbageCollectionTip', false); - return wrapper.vm.$nextTick().then(() => { - expect(findAlert().exists()).toBe(false); - }); - }); - - it('contains a link to the docs', () => { - const link = findLink(); - expect(link.exists()).toBe(true); - expect(link.attributes('href')).toBe(store.state.config.garbageCollectionHelpPagePath); - }); - }); }); diff --git a/spec/frontend/registry/explorer/stores/actions_spec.js b/spec/frontend/registry/explorer/stores/actions_spec.js index 58f61a0e8c2..15f9db90910 100644 --- a/spec/frontend/registry/explorer/stores/actions_spec.js +++ b/spec/frontend/registry/explorer/stores/actions_spec.js @@ -191,7 +191,10 @@ describe('Actions RegistryExplorer Store', () => { { tagsPagination: {}, }, - [{ type: types.SET_MAIN_LOADING, payload: true }], + [ + { type: types.SET_MAIN_LOADING, payload: true }, + { type: types.SET_MAIN_LOADING, payload: false }, + ], [ { type: 'setShowGarbageCollectionTip', @@ -220,8 +223,7 @@ describe('Actions RegistryExplorer Store', () => { { type: types.SET_MAIN_LOADING, payload: false }, ], [], - done, - ); + ).catch(() => done()); }); }); @@ -241,7 +243,10 @@ describe('Actions RegistryExplorer Store', () => { { tagsPagination: {}, }, - [{ type: types.SET_MAIN_LOADING, payload: true }], + [ + { type: types.SET_MAIN_LOADING, payload: true }, + { type: types.SET_MAIN_LOADING, payload: false }, + ], [ { type: 'setShowGarbageCollectionTip', @@ -273,8 +278,7 @@ describe('Actions RegistryExplorer Store', () => { { type: types.SET_MAIN_LOADING, payload: false }, ], [], - done, - ); + ).catch(() => done()); }); }); @@ -311,9 +315,7 @@ describe('Actions RegistryExplorer Store', () => { { type: types.SET_MAIN_LOADING, payload: false }, ], [], - ).catch(() => { - done(); - }); + ).catch(() => done()); }); }); }); diff --git a/spec/lib/gitlab/metrics/samplers/ruby_sampler_spec.rb b/spec/lib/gitlab/metrics/samplers/ruby_sampler_spec.rb index 8c4071a7ed1..9d8ec2d9b21 100644 --- a/spec/lib/gitlab/metrics/samplers/ruby_sampler_spec.rb +++ b/spec/lib/gitlab/metrics/samplers/ruby_sampler_spec.rb @@ -19,20 +19,19 @@ describe Gitlab::Metrics::Samplers::RubySampler do end describe '#sample' do - it 'samples various statistics' do - expect(Gitlab::Metrics::System).to receive(:cpu_time) - expect(Gitlab::Metrics::System).to receive(:file_descriptor_count) - expect(Gitlab::Metrics::System).to receive(:memory_usage) - expect(Gitlab::Metrics::System).to receive(:max_open_file_descriptors) - expect(sampler).to receive(:sample_gc) + it 'adds a metric containing the process resident memory bytes' do + expect(Gitlab::Metrics::System).to receive(:memory_usage).and_return(9000) + + expect(sampler.metrics[:process_resident_memory_bytes]).to receive(:set).with({}, 9000) sampler.sample end - it 'adds a metric containing the process resident memory bytes' do - expect(Gitlab::Metrics::System).to receive(:memory_usage).and_return(9000) + it 'adds a metric containing the process unique and proportional memory bytes' do + expect(Gitlab::Metrics::System).to receive(:memory_usage_uss_pss).and_return(uss: 9000, pss: 10_000) - expect(sampler.metrics[:process_resident_memory_bytes]).to receive(:set).with({}, 9000) + expect(sampler.metrics[:process_unique_memory_bytes]).to receive(:set).with({}, 9000) + expect(sampler.metrics[:process_proportional_memory_bytes]).to receive(:set).with({}, 10_000) sampler.sample end diff --git a/spec/lib/gitlab/metrics/system_spec.rb b/spec/lib/gitlab/metrics/system_spec.rb index a5aa80686fd..37d26bd9d63 100644 --- a/spec/lib/gitlab/metrics/system_spec.rb +++ b/spec/lib/gitlab/metrics/system_spec.rb @@ -3,33 +3,122 @@ require 'spec_helper' describe Gitlab::Metrics::System do - if File.exist?('/proc') + context 'when /proc files exist' do + # Fixtures pulled from: + # Linux carbon 5.3.0-7648-generic #41~1586789791~19.10~9593806-Ubuntu SMP Mon Apr 13 17:50:40 UTC x86_64 x86_64 x86_64 GNU/Linux + let(:proc_status) do + # most rows omitted for brevity + <<~SNIP + Name: less + VmHWM: 2468 kB + VmRSS: 2468 kB + RssAnon: 260 kB + SNIP + end + + let(:proc_smaps_rollup) do + # full snapshot + <<~SNIP + Rss: 2564 kB + Pss: 503 kB + Pss_Anon: 312 kB + Pss_File: 191 kB + Pss_Shmem: 0 kB + Shared_Clean: 2100 kB + Shared_Dirty: 0 kB + Private_Clean: 152 kB + Private_Dirty: 312 kB + Referenced: 2564 kB + Anonymous: 312 kB + LazyFree: 0 kB + AnonHugePages: 0 kB + ShmemPmdMapped: 0 kB + Shared_Hugetlb: 0 kB + Private_Hugetlb: 0 kB + Swap: 0 kB + SwapPss: 0 kB + Locked: 0 kB + SNIP + end + + let(:proc_limits) do + # full snapshot + <<~SNIP + Limit Soft Limit Hard Limit Units + Max cpu time unlimited unlimited seconds + Max file size unlimited unlimited bytes + Max data size unlimited unlimited bytes + Max stack size 8388608 unlimited bytes + Max core file size 0 unlimited bytes + Max resident set unlimited unlimited bytes + Max processes 126519 126519 processes + Max open files 1024 1048576 files + Max locked memory 67108864 67108864 bytes + Max address space unlimited unlimited bytes + Max file locks unlimited unlimited locks + Max pending signals 126519 126519 signals + Max msgqueue size 819200 819200 bytes + Max nice priority 0 0 + Max realtime priority 0 0 + Max realtime timeout unlimited unlimited us + SNIP + end + describe '.memory_usage' do - it "returns the process' memory usage in bytes" do - expect(described_class.memory_usage).to be > 0 + it "returns the process' resident set size (RSS) in bytes" do + mock_existing_proc_file('/proc/self/status', proc_status) + + expect(described_class.memory_usage).to eq(2527232) end end describe '.file_descriptor_count' do it 'returns the amount of open file descriptors' do - expect(described_class.file_descriptor_count).to be > 0 + expect(Dir).to receive(:glob).and_return(['/some/path', '/some/other/path']) + + expect(described_class.file_descriptor_count).to eq(2) end end describe '.max_open_file_descriptors' do it 'returns the max allowed open file descriptors' do - expect(described_class.max_open_file_descriptors).to be > 0 + mock_existing_proc_file('/proc/self/limits', proc_limits) + + expect(described_class.max_open_file_descriptors).to eq(1024) + end + end + + describe '.memory_usage_uss_pss' do + it "returns the process' unique and porportional set size (USS/PSS) in bytes" do + mock_existing_proc_file('/proc/self/smaps_rollup', proc_smaps_rollup) + + # (Private_Clean (152 kB) + Private_Dirty (312 kB) + Private_Hugetlb (0 kB)) * 1024 + expect(described_class.memory_usage_uss_pss).to eq(uss: 475136, pss: 515072) end end - else + end + + context 'when /proc files do not exist' do + before do + mock_missing_proc_file + end + describe '.memory_usage' do - it 'returns 0.0' do - expect(described_class.memory_usage).to eq(0.0) + it 'returns 0' do + expect(described_class.memory_usage).to eq(0) + end + end + + describe '.memory_usage_uss_pss' do + it "returns 0 for all components" do + expect(described_class.memory_usage_uss_pss).to eq(uss: 0, pss: 0) end end describe '.file_descriptor_count' do it 'returns 0' do + expect(Dir).to receive(:glob).and_return([]) + expect(described_class.file_descriptor_count).to eq(0) end end @@ -98,4 +187,12 @@ describe Gitlab::Metrics::System do expect(described_class.thread_cpu_duration(start_time)).to be_nil end end + + def mock_existing_proc_file(path, content) + allow(File).to receive(:foreach).with(path) { |_path, &block| content.each_line(&block) } + end + + def mock_missing_proc_file + allow(File).to receive(:foreach).and_raise(Errno::ENOENT) + end end diff --git a/spec/lib/gitlab/repository_url_builder_spec.rb b/spec/lib/gitlab/repository_url_builder_spec.rb index 1eb9de48405..a5797146cc5 100644 --- a/spec/lib/gitlab/repository_url_builder_spec.rb +++ b/spec/lib/gitlab/repository_url_builder_spec.rb @@ -10,7 +10,6 @@ describe Gitlab::RepositoryUrlBuilder do :project | ->(project) { project.full_path } :project_snippet | ->(snippet) { "#{snippet.project.full_path}/snippets/#{snippet.id}" } :project_wiki | ->(wiki) { "#{wiki.container.full_path}.wiki" } - :group_wiki | ->(wiki) { "#{wiki.container.full_path}.wiki" } :personal_snippet | ->(snippet) { "snippets/#{snippet.id}" } end diff --git a/spec/lib/gitlab/static_site_editor/config_spec.rb b/spec/lib/gitlab/static_site_editor/config_spec.rb index b32af912ad9..a1db567db1a 100644 --- a/spec/lib/gitlab/static_site_editor/config_spec.rb +++ b/spec/lib/gitlab/static_site_editor/config_spec.rb @@ -5,9 +5,10 @@ require 'spec_helper' describe Gitlab::StaticSiteEditor::Config do subject(:config) { described_class.new(repository, ref, file_path, return_url) } - let(:project) { create(:project, :public, :repository, name: 'project', namespace: namespace) } - let(:namespace) { create(:namespace, name: 'namespace') } - let(:repository) { project.repository } + let_it_be(:namespace) { create(:namespace, name: 'namespace') } + let_it_be(:project) { create(:project, :public, :repository, name: 'project', namespace: namespace) } + let_it_be(:repository) { project.repository } + let(:ref) { 'master' } let(:file_path) { 'README.md' } let(:return_url) { 'http://example.com' } @@ -24,10 +25,17 @@ describe Gitlab::StaticSiteEditor::Config do project: 'project', project_id: project.id, return_url: 'http://example.com', - is_supported_content: 'true' + is_supported_content: 'true', + base_url: '/namespace/project/-/sse/master%2FREADME.md' ) end + context 'when file path is nested' do + let(:file_path) { 'lib/README.md' } + + it { is_expected.to include(base_url: '/namespace/project/-/sse/master%2Flib%2FREADME.md') } + end + context 'when branch is not master' do let(:ref) { 'my-branch' } @@ -53,7 +61,7 @@ describe Gitlab::StaticSiteEditor::Config do end context 'when repository is empty' do - let(:project) { create(:project_empty_repo) } + let(:repository) { create(:project_empty_repo).repository } it { is_expected.to include(is_supported_content: 'false') } end diff --git a/spec/lib/gitlab/url_builder_spec.rb b/spec/lib/gitlab/url_builder_spec.rb index 7989b863781..71ffa4a00a1 100644 --- a/spec/lib/gitlab/url_builder_spec.rb +++ b/spec/lib/gitlab/url_builder_spec.rb @@ -28,7 +28,6 @@ describe Gitlab::UrlBuilder do :group | ->(group) { "/groups/#{group.full_path}" } :group_milestone | ->(milestone) { "/groups/#{milestone.group.full_path}/-/milestones/#{milestone.iid}" } - :group_wiki | ->(wiki) { "/groups/#{wiki.container.full_path}/-/wikis/home" } :user | ->(user) { "/#{user.full_path}" } :personal_snippet | ->(snippet) { "/snippets/#{snippet.id}" } diff --git a/spec/models/group_spec.rb b/spec/models/group_spec.rb index 04801983d6c..6e2cc10ab0c 100644 --- a/spec/models/group_spec.rb +++ b/spec/models/group_spec.rb @@ -27,11 +27,6 @@ describe Group do it { is_expected.to have_many(:milestones) } it { is_expected.to have_many(:sprints) } - it_behaves_like 'model with wiki' do - let(:container) { create(:group, :nested, :wiki_repo) } - let(:container_without_wiki) { create(:group, :nested) } - end - describe '#members & #requesters' do let(:requester) { create(:user) } let(:developer) { create(:user) } diff --git a/spec/models/group_wiki_spec.rb b/spec/models/group_wiki_spec.rb deleted file mode 100644 index ed6bac5311b..00000000000 --- a/spec/models/group_wiki_spec.rb +++ /dev/null @@ -1,38 +0,0 @@ -# frozen_string_literal: true - -require 'spec_helper' - -describe GroupWiki do - it_behaves_like 'wiki model' do - let(:wiki_container) { create(:group, :wiki_repo) } - let(:wiki_container_without_repo) { create(:group) } - - before do - wiki_container.add_owner(user) - end - - describe '#storage' do - it 'uses the group repository prefix' do - expect(subject.storage.base_dir).to start_with('@groups/') - end - end - - describe '#repository_storage' do - it 'returns the default storage' do - expect(subject.repository_storage).to eq('default') - end - end - - describe '#hashed_storage?' do - it 'returns true' do - expect(subject.hashed_storage?).to be(true) - end - end - - describe '#disk_path' do - it 'returns the repository storage path' do - expect(subject.disk_path).to eq("#{subject.storage.disk_path}.wiki") - end - end - end -end diff --git a/spec/models/wiki_page_spec.rb b/spec/models/wiki_page_spec.rb index 99a2ce28d19..eb241fa123f 100644 --- a/spec/models/wiki_page_spec.rb +++ b/spec/models/wiki_page_spec.rb @@ -150,15 +150,7 @@ describe WikiPage do enable_front_matter_for(container) end - context 'with a project container' do - it_behaves_like 'a page with front-matter' - end - - context 'with a group container' do - let(:container) { create(:group) } - - it_behaves_like 'a page with front-matter' - end + it_behaves_like 'a page with front-matter' end end end @@ -512,15 +504,7 @@ describe WikiPage do enable_front_matter_for(container) end - context 'with a project container' do - it_behaves_like 'able to update front-matter' - end - - context 'with a group container' do - let(:container) { create(:group) } - - it_behaves_like 'able to update front-matter' - end + it_behaves_like 'able to update front-matter' end end @@ -826,22 +810,13 @@ describe WikiPage do expect(subject).not_to eq(other_page) end - it 'returns false for page with the same slug on a different container of the same type' do + it 'returns false for page with the same slug on a different container' do other_page = create(:wiki_page, title: existing_page.slug) expect(subject.slug).to eq(other_page.slug) expect(subject.container).not_to eq(other_page.container) expect(subject).not_to eq(other_page) end - - it 'returns false for page with the same slug on a different container type' do - group = create(:group, name: container.name) - other_page = create(:wiki_page, title: existing_page.slug, container: group) - - expect(subject.slug).to eq(other_page.slug) - expect(subject.container).not_to eq(other_page.container) - expect(subject).not_to eq(other_page) - end end describe '#last_commit_sha' do |