summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorShinya Maeda <shinya@gitlab.com>2018-11-07 18:56:34 +0900
committerShinya Maeda <shinya@gitlab.com>2018-11-07 18:56:34 +0900
commit9b807a1091d7939e0b5206d6fd76a3a034d4cda4 (patch)
tree157d072d90138ea2100f3f7915654420602aea70
parent66d43c84810838cf496134a05fde8dfcc5c8246f (diff)
downloadgitlab-ce-fix-environment-status-in-merge-request-widget.tar.gz
-rw-r--r--spec/features/projects/environments/environment_spec.rb6
-rw-r--r--spec/models/environment_status_spec.rb2
2 files changed, 4 insertions, 4 deletions
diff --git a/spec/features/projects/environments/environment_spec.rb b/spec/features/projects/environments/environment_spec.rb
index 0d82df6dc8e..9772a7bacac 100644
--- a/spec/features/projects/environments/environment_spec.rb
+++ b/spec/features/projects/environments/environment_spec.rb
@@ -25,7 +25,7 @@ describe 'Environment' do
end
context 'without deployments' do
- it 'does show no deployments' do
+ it 'does not show deployments' do
expect(page).to have_content('You don\'t have any deployments right now.')
end
end
@@ -64,7 +64,7 @@ describe 'Environment' do
create(:deployment, :running, environment: environment, deployable: build)
end
- it 'does show no deployments' do
+ it 'does not show deployments' do
expect(page).to have_content('You don\'t have any deployments right now.')
end
end
@@ -77,7 +77,7 @@ describe 'Environment' do
create(:deployment, :failed, environment: environment, deployable: build)
end
- it 'does show no deployments' do
+ it 'does not show deployments' do
expect(page).to have_content('You don\'t have any deployments right now.')
end
end
diff --git a/spec/models/environment_status_spec.rb b/spec/models/environment_status_spec.rb
index db9ee204849..90f7e4a4590 100644
--- a/spec/models/environment_status_spec.rb
+++ b/spec/models/environment_status_spec.rb
@@ -99,7 +99,7 @@ describe EnvironmentStatus do
let(:user) { project.owner }
before do
- build.deployment&.update(sha: sha)
+ build.deployment&.update!(sha: sha)
end
context 'when environment is created on a forked project' do