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
fe6a0fbe
Commit
fe6a0fbe
authored
Jun 09, 2017
by
Phil Hughes
Browse files
Options
Browse Files
Download
Plain Diff
Merge branch '2514-deploy-board' into 'master'
Fixes deploy board error spec Closes #2514 See merge request !2064
parents
497a1286
1f60f2af
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
8 additions
and
11 deletions
+8
-11
spec/javascripts/environments/environment_table_spec.js
spec/javascripts/environments/environment_table_spec.js
+8
-11
No files found.
spec/javascripts/environments/environment_table_spec.js
View file @
fe6a0fbe
import
Vue
from
'
vue
'
;
import
environmentTableComp
from
'
~/environments/components/environments_table.vue
'
;
import
{
deployBoardMockData
}
from
'
./mock_data
'
;
describe
(
'
Environment item
'
,
()
=>
{
let
EnvironmentTable
;
...
...
@@ -40,15 +41,7 @@ describe('Environment item', () => {
id
:
1
,
rollout_status_path
:
'
url
'
,
hasDeployBoard
:
true
,
deployBoardData
:
{
instances
:
[
{
status
:
'
ready
'
,
tooltip
:
'
foo
'
},
],
abort_url
:
'
url
'
,
rollback_url
:
'
url
'
,
completion
:
100
,
is_completed
:
true
,
},
deployBoardData
:
deployBoardMockData
,
isDeployBoardVisible
:
true
,
};
...
...
@@ -60,7 +53,9 @@ describe('Environment item', () => {
canReadEnvironment
:
true
,
toggleDeployBoard
:
()
=>
{},
store
:
{},
service
:
{},
service
:
{
getDeployBoard
:
()
=>
Promise
.
resolve
(),
},
},
}).
$mount
();
...
...
@@ -100,7 +95,9 @@ describe('Environment item', () => {
canReadEnvironment
:
true
,
toggleDeployBoard
:
spy
,
store
:
{},
service
:
{},
service
:
{
getDeployBoard
:
()
=>
Promise
.
resolve
(),
},
},
}).
$mount
();
...
...
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