Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
G
gitlab-ce
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
1
Merge Requests
1
Analytics
Analytics
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Commits
Issue Boards
Open sidebar
nexedi
gitlab-ce
Commits
c4e45d89
Commit
c4e45d89
authored
Oct 18, 2016
by
Kamil Trzcinski
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Fix remaining offenses
parent
ad859287
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
5 additions
and
4 deletions
+5
-4
spec/features/merge_requests/widget_deployments_spec.rb
spec/features/merge_requests/widget_deployments_spec.rb
+1
-1
spec/models/environment_spec.rb
spec/models/environment_spec.rb
+4
-3
No files found.
spec/features/merge_requests/widget_deployments_spec.rb
View file @
c4e45d89
...
@@ -32,7 +32,7 @@ feature 'Widget Deployments Header', feature: true, js: true do
...
@@ -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
(
:manual
)
{
create
(
:ci_build
,
:manual
,
pipeline:
pipeline
,
name:
'close_app'
)
}
given
(
:deployment
)
do
given
(
:deployment
)
do
create
(
:deployment
,
environment:
environment
,
ref:
merge_request
.
target_branch
,
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
end
background
do
background
do
...
...
spec/models/environment_spec.rb
View file @
c4e45d89
...
@@ -150,8 +150,8 @@ describe Environment, models: true do
...
@@ -150,8 +150,8 @@ describe Environment, models: true do
let!
(
:close_action
)
{
create
(
:ci_build
,
:manual
,
pipeline:
build
.
pipeline
,
name:
'close_app'
)
}
let!
(
:close_action
)
{
create
(
:ci_build
,
:manual
,
pipeline:
build
.
pipeline
,
name:
'close_app'
)
}
it
'returns the same action'
do
it
'returns the same action'
do
is_expected
.
to
eq
(
close_action
)
expect
(
subject
)
.
to
eq
(
close_action
)
is_expected
.
to
include
(
user:
user
)
expect
(
subject
.
user
).
to
eq
(
user
)
end
end
end
end
...
@@ -160,7 +160,8 @@ describe Environment, models: true do
...
@@ -160,7 +160,8 @@ describe Environment, models: true do
it
'returns a new action of the same type'
do
it
'returns a new action of the same type'
do
is_expected
.
to
be_persisted
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
end
end
end
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment