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
0
Merge Requests
0
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
Tatuya Kamada
gitlab-ce
Commits
43898f8e
Commit
43898f8e
authored
Nov 18, 2016
by
Filipa Lacerda
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Fix broken tests
parent
8765fcdc
Changes
2
Show whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
11 additions
and
11 deletions
+11
-11
spec/javascripts/environments/environment_actions_spec.js.es6
.../javascripts/environments/environment_actions_spec.js.es6
+3
-3
spec/javascripts/environments/environment_item_spec.js.es6
spec/javascripts/environments/environment_item_spec.js.es6
+8
-8
No files found.
spec/javascripts/environments/environment_actions_spec.js.es6
View file @
43898f8e
...
@@ -12,11 +12,11 @@ describe('Actions Component', () => {
...
@@ -12,11 +12,11 @@ describe('Actions Component', () => {
const actionsMock = [
const actionsMock = [
{
{
name: 'bar',
name: 'bar',
play_
url
: 'https://gitlab.com/play',
play_
path
: 'https://gitlab.com/play',
},
},
{
{
name: 'foo',
name: 'foo',
play_
url
: '#',
play_
path
: '#',
},
},
];
];
...
@@ -32,6 +32,6 @@ describe('Actions Component', () => {
...
@@ -32,6 +32,6 @@ describe('Actions Component', () => {
).toEqual(actionsMock.length);
).toEqual(actionsMock.length);
expect(
expect(
component.$el.querySelector('.dropdown-menu li a').getAttribute('href')
component.$el.querySelector('.dropdown-menu li a').getAttribute('href')
).toEqual(actionsMock[0].play_
url
);
).toEqual(actionsMock[0].play_
path
);
});
});
});
});
spec/javascripts/environments/environment_item_spec.js.es6
View file @
43898f8e
...
@@ -74,7 +74,7 @@ describe('Environment item', () => {
...
@@ -74,7 +74,7 @@ describe('Environment item', () => {
sha: '500aabcb17c97bdcf2d0c410b70cb8556f0362dd',
sha: '500aabcb17c97bdcf2d0c410b70cb8556f0362dd',
ref: {
ref: {
name: 'master',
name: 'master',
ref_
url: 'http://localhost:3000/
root/ci-folders/tree/master',
ref_
path: '
root/ci-folders/tree/master',
},
},
tag: true,
tag: true,
'last?': true,
'last?': true,
...
@@ -102,23 +102,23 @@ describe('Environment item', () => {
...
@@ -102,23 +102,23 @@ describe('Environment item', () => {
avatar_url: 'http://www.gravatar.com/avatar/e64c7d89f26bd1972efa854d13d7dd61?s=80\u0026d=identicon',
avatar_url: 'http://www.gravatar.com/avatar/e64c7d89f26bd1972efa854d13d7dd61?s=80\u0026d=identicon',
web_url: 'http://localhost:3000/root',
web_url: 'http://localhost:3000/root',
},
},
commit_
url: 'http://localhost:3000
/root/ci-folders/tree/500aabcb17c97bdcf2d0c410b70cb8556f0362dd',
commit_
path: '
/root/ci-folders/tree/500aabcb17c97bdcf2d0c410b70cb8556f0362dd',
},
},
deployable: {
deployable: {
id: 1279,
id: 1279,
name: 'deploy',
name: 'deploy',
build_
url: 'http://localhost:3000
/root/ci-folders/builds/1279',
build_
path: '
/root/ci-folders/builds/1279',
retry_
url: 'http://localhost:3000
/root/ci-folders/builds/1279/retry',
retry_
path: '
/root/ci-folders/builds/1279/retry',
},
},
manual_actions: [
manual_actions: [
{
{
name: 'action',
name: 'action',
play_
url: 'http://localhost:3000
/play',
play_
path: '
/play',
},
},
],
],
},
},
'stoppable?': true,
'stoppable?': true,
environment_
url: 'http://localhost:3000/
root/ci-folders/environments/31',
environment_
path: '
root/ci-folders/environments/31',
created_at: '2016-11-07T11:11:16.525Z',
created_at: '2016-11-07T11:11:16.525Z',
updated_at: '2016-11-10T15:55:58.778Z',
updated_at: '2016-11-10T15:55:58.778Z',
};
};
...
@@ -161,13 +161,13 @@ describe('Environment item', () => {
...
@@ -161,13 +161,13 @@ describe('Environment item', () => {
it('Should link to build url provided', () => {
it('Should link to build url provided', () => {
expect(
expect(
component.$el.querySelector('.build-link').getAttribute('href')
component.$el.querySelector('.build-link').getAttribute('href')
).toEqual(environment.last_deployment.deployable.build_
url
);
).toEqual(environment.last_deployment.deployable.build_
path
);
});
});
it('Should render deployable name and id', () => {
it('Should render deployable name and id', () => {
expect(
expect(
component.$el.querySelector('.build-link').getAttribute('href')
component.$el.querySelector('.build-link').getAttribute('href')
).toEqual(environment.last_deployment.deployable.build_
url
);
).toEqual(environment.last_deployment.deployable.build_
path
);
});
});
});
});
...
...
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