Welcome to mirror list, hosted at ThFree Co, Russian Federation.

gitlab.com/gitlab-org/gitlab-foss.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorKamil Trzciński <ayufan@ayufan.eu>2018-11-12 22:32:40 +0300
committerKamil Trzciński <ayufan@ayufan.eu>2018-11-12 22:32:40 +0300
commit7a98f0bdc00ae929708b588cc02714c4cd7f09ee (patch)
tree594761353d3f437c039427c680db6911ba00c859 /spec/services
parentc739b8e0d6258276100da68c2ba1e2ecb7e8bde1 (diff)
Revert "Just fix (hack) specs"
This reverts commit c739b8e0d6258276100da68c2ba1e2ecb7e8bde1.
Diffstat (limited to 'spec/services')
-rw-r--r--spec/services/update_deployment_service_spec.rb12
1 files changed, 6 insertions, 6 deletions
diff --git a/spec/services/update_deployment_service_spec.rb b/spec/services/update_deployment_service_spec.rb
index 124ad6e7581..3c55dd9659a 100644
--- a/spec/services/update_deployment_service_spec.rb
+++ b/spec/services/update_deployment_service_spec.rb
@@ -10,7 +10,7 @@ describe UpdateDeploymentService do
tag: false,
environment: 'production',
options: { environment: options },
- project: project).reload
+ project: project)
end
let(:project) { create(:project, :repository) }
@@ -99,7 +99,7 @@ describe UpdateDeploymentService do
ref: 'master',
environment: 'production',
project: project,
- options: { environment: { name: 'production', url: 'http://review/$CI_COMMIT_REF_NAME' } }).reload
+ options: { environment: { name: 'production', url: 'http://review/$CI_COMMIT_REF_NAME' } })
end
it { is_expected.to eq('http://review/master') }
@@ -111,7 +111,7 @@ describe UpdateDeploymentService do
ref: 'master',
environment: 'prod-slug',
project: project,
- options: { environment: { name: 'prod-slug', url: 'http://review/$CI_ENVIRONMENT_SLUG' } }).reload
+ options: { environment: { name: 'prod-slug', url: 'http://review/$CI_ENVIRONMENT_SLUG' } })
end
it { is_expected.to eq('http://review/prod-slug') }
@@ -123,14 +123,14 @@ describe UpdateDeploymentService do
yaml_variables: [{ key: :APP_HOST, value: 'host' }],
environment: 'production',
project: project,
- options: { environment: { name: 'production', url: 'http://review/$APP_HOST' } }).reload
+ options: { environment: { name: 'production', url: 'http://review/$APP_HOST' } })
end
it { is_expected.to eq('http://review/host') }
end
context 'when yaml environment does not have url' do
- let(:job) { create(:ci_build, environment: 'staging', project: project).reload }
+ let(:job) { create(:ci_build, environment: 'staging', project: project) }
it 'returns the external_url from persisted environment' do
is_expected.to be_nil
@@ -160,7 +160,7 @@ describe UpdateDeploymentService do
tag: false,
environment: 'staging',
options: { environment: { name: 'staging' } },
- project: project).reload
+ project: project)
end
it "doesn't set the time if the deploy's environment is not 'production'" do