diff options
author | GitLab Bot <gitlab-bot@gitlab.com> | 2019-12-21 03:07:37 +0000 |
---|---|---|
committer | GitLab Bot <gitlab-bot@gitlab.com> | 2019-12-21 03:07:37 +0000 |
commit | bc3e57199e52e45799cb4d47ee2630af40d1edc3 (patch) | |
tree | ecf9aab2b81f91f857d4d116fbf4448675c7a2d8 /spec/models/environment_spec.rb | |
parent | bb348db4c22bf58ac685fcd66445ac172491b302 (diff) | |
download | gitlab-ce-bc3e57199e52e45799cb4d47ee2630af40d1edc3.tar.gz |
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'spec/models/environment_spec.rb')
-rw-r--r-- | spec/models/environment_spec.rb | 23 |
1 files changed, 10 insertions, 13 deletions
diff --git a/spec/models/environment_spec.rb b/spec/models/environment_spec.rb index e37a7e85b75..fe1517e76d3 100644 --- a/spec/models/environment_spec.rb +++ b/spec/models/environment_spec.rb @@ -7,7 +7,7 @@ describe Environment, :use_clean_rails_memory_store_caching do using RSpec::Parameterized::TableSyntax include RepoHelpers - let(:project) { create(:project, :stubbed_repository) } + let(:project) { create(:project, :repository) } subject(:environment) { create(:environment, project: project) } @@ -29,7 +29,6 @@ describe Environment, :use_clean_rails_memory_store_caching do it { is_expected.to validate_length_of(:external_url).is_at_most(255) } describe '.order_by_last_deployed_at' do - let(:project) { create(:project, :repository) } let!(:environment1) { create(:environment, project: project) } let!(:environment2) { create(:environment, project: project) } let!(:environment3) { create(:environment, project: project) } @@ -139,8 +138,8 @@ describe Environment, :use_clean_rails_memory_store_caching do describe '.with_deployment' do subject { described_class.with_deployment(sha) } - let(:environment) { create(:environment) } - let(:sha) { RepoHelpers.sample_commit.id } + let(:environment) { create(:environment, project: project) } + let(:sha) { 'b83d6e391c22777fca1ed3012fce84f633d7fed0' } context 'when deployment has the specified sha' do let!(:deployment) { create(:deployment, environment: environment, sha: sha) } @@ -149,7 +148,7 @@ describe Environment, :use_clean_rails_memory_store_caching do end context 'when deployment does not have the specified sha' do - let!(:deployment) { create(:deployment, environment: environment, sha: 'abc') } + let!(:deployment) { create(:deployment, environment: environment, sha: 'ddd0f15ae83993f5cb66a927a28673882e99100b') } it { is_expected.to be_empty } end @@ -158,7 +157,7 @@ describe Environment, :use_clean_rails_memory_store_caching do describe '#folder_name' do context 'when it is inside a folder' do subject(:environment) do - create(:environment, name: 'staging/review-1') + create(:environment, name: 'staging/review-1', project: project) end it 'returns a top-level folder name' do @@ -672,8 +671,7 @@ describe Environment, :use_clean_rails_memory_store_caching do context 'when the environment is available' do context 'with a deployment service' do context 'when user configured kubernetes from CI/CD > Clusters' do - let!(:cluster) { create(:cluster, :project, :provided_by_gcp) } - let(:project) { cluster.project } + let!(:cluster) { create(:cluster, :project, :provided_by_gcp, projects: [project]) } context 'with deployment' do let!(:deployment) { create(:deployment, :success, environment: environment) } @@ -794,10 +792,9 @@ describe Environment, :use_clean_rails_memory_store_caching do end describe '#calculate_reactive_cache' do - let(:cluster) { create(:cluster, :project, :provided_by_user) } - let(:project) { cluster.project } - let(:environment) { create(:environment, project: project) } - let!(:deployment) { create(:deployment, :success, environment: environment) } + let!(:cluster) { create(:cluster, :project, :provided_by_user, projects: [project]) } + let!(:environment) { create(:environment, project: project) } + let!(:deployment) { create(:deployment, :success, environment: environment, project: project) } subject { environment.calculate_reactive_cache } @@ -830,7 +827,7 @@ describe Environment, :use_clean_rails_memory_store_caching do context 'when the environment is available' do context 'with a deployment service' do - let(:project) { create(:prometheus_project) } + let(:project) { create(:prometheus_project, :repository) } context 'and a deployment' do let!(:deployment) { create(:deployment, environment: environment) } |