summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMatija Čupić <matteeyah@gmail.com>2018-03-22 13:33:24 +0100
committerMatija Čupić <matteeyah@gmail.com>2018-03-22 13:33:24 +0100
commit92d51da23dfa3e83fb87fd381553a1fd93d49614 (patch)
tree2f632d93577816f10095f1a872c48bf4a742d7be
parent78cee2c57b49d396c5998becfeb5032de196c939 (diff)
downloadgitlab-ce-43482-enabling-auto-devops-on-an-empty-project-gives-you-wrong-information.tar.gz
-rw-r--r--spec/controllers/projects/pipelines_settings_controller_spec.rb8
1 files changed, 1 insertions, 7 deletions
diff --git a/spec/controllers/projects/pipelines_settings_controller_spec.rb b/spec/controllers/projects/pipelines_settings_controller_spec.rb
index 0dd8575e2b7..913b9bd804a 100644
--- a/spec/controllers/projects/pipelines_settings_controller_spec.rb
+++ b/spec/controllers/projects/pipelines_settings_controller_spec.rb
@@ -48,10 +48,6 @@ describe Projects::PipelinesSettingsController do
end
context 'when the project repository is empty' do
- before do
- allow_any_instance_of(Project).to receive(:empty_repo?).and_return(true)
- end
-
it 'sets a warning flash' do
expect(subject).to set_flash[:warning]
end
@@ -64,9 +60,7 @@ describe Projects::PipelinesSettingsController do
end
context 'when the project repository is not empty' do
- before do
- allow_any_instance_of(Project).to receive(:empty_repo?).and_return(false)
- end
+ let(:project) { create(:project, :repository) }
it 'sets a success flash' do
allow(CreatePipelineWorker).to receive(:perform_async).with(project.id, user.id, project.default_branch, :web, any_args)