diff options
author | Douwe Maan <douwe@gitlab.com> | 2017-06-29 15:15:39 +0000 |
---|---|---|
committer | Douwe Maan <douwe@gitlab.com> | 2017-06-29 15:15:39 +0000 |
commit | 0b704d4ece1fd42b324a85befaace9f7c5345f3d (patch) | |
tree | 6c27b9d09dc61eb5fabb67a274f25d5d17bd56d4 /spec/models | |
parent | 2c879643219fdba20681bfcdd8b12d66fd2aef84 (diff) | |
parent | 7b77e2862ad1c294aeff5c0bf5f77ac3f0211801 (diff) | |
download | gitlab-ce-0b704d4ece1fd42b324a85befaace9f7c5345f3d.tar.gz |
Merge branch 'refactor-namespace-default-scope-override' into 'master'
Remove Namespace model default scope override and write additional test to Project search
See merge request !12546
Diffstat (limited to 'spec/models')
-rw-r--r-- | spec/models/project_spec.rb | 10 |
1 files changed, 10 insertions, 0 deletions
diff --git a/spec/models/project_spec.rb b/spec/models/project_spec.rb index 5565fd2d391..1390848ff4a 100644 --- a/spec/models/project_spec.rb +++ b/spec/models/project_spec.rb @@ -1170,6 +1170,16 @@ describe Project, models: true do expect(relation.search(project.namespace.name)).to eq([project]) end + + describe 'with pending_delete project' do + let(:pending_delete_project) { create(:empty_project, pending_delete: true) } + + it 'shows pending deletion project' do + search_result = described_class.search(pending_delete_project.name) + + expect(search_result).to eq([pending_delete_project]) + end + end end describe '#rename_repo' do |