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 Trzcinski <ayufan@ayufan.eu>2016-10-18 14:51:12 +0300
committerKamil Trzcinski <ayufan@ayufan.eu>2016-10-18 14:51:12 +0300
commitc4e45d89d407016c89c5217cb91a7a82cf8710f1 (patch)
tree76971423444854d6f338f653cc5231ce7a783fa8
parentad85928752ea6c41863c6b8225ff2279e3044bef (diff)
Fix remaining offenses
-rw-r--r--spec/features/merge_requests/widget_deployments_spec.rb2
-rw-r--r--spec/models/environment_spec.rb7
2 files changed, 5 insertions, 4 deletions
diff --git a/spec/features/merge_requests/widget_deployments_spec.rb b/spec/features/merge_requests/widget_deployments_spec.rb
index 1be35b27d84..6676821b807 100644
--- a/spec/features/merge_requests/widget_deployments_spec.rb
+++ b/spec/features/merge_requests/widget_deployments_spec.rb
@@ -32,7 +32,7 @@ feature 'Widget Deployments Header', feature: true, js: true do
given(:manual) { create(:ci_build, :manual, pipeline: pipeline, name: 'close_app') }
given(:deployment) do
create(:deployment, environment: environment, ref: merge_request.target_branch,
- sha: sha, deployable: build, on_stop: 'close_app')
+ sha: sha, deployable: build, on_stop: 'close_app')
end
background do
diff --git a/spec/models/environment_spec.rb b/spec/models/environment_spec.rb
index e1755f940b3..a94e6d0165f 100644
--- a/spec/models/environment_spec.rb
+++ b/spec/models/environment_spec.rb
@@ -150,8 +150,8 @@ describe Environment, models: true do
let!(:close_action) { create(:ci_build, :manual, pipeline: build.pipeline, name: 'close_app') }
it 'returns the same action' do
- is_expected.to eq(close_action)
- is_expected.to include(user: user)
+ expect(subject).to eq(close_action)
+ expect(subject.user).to eq(user)
end
end
@@ -160,7 +160,8 @@ describe Environment, models: true do
it 'returns a new action of the same type' do
is_expected.to be_persisted
- is_expected.to include(name: close_action.name, user: user)
+ expect(subject.name).to eq(close_action.name)
+ expect(subject.user).to eq(user)
end
end
end