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
Boxiang Sun
gitlab-ce
Commits
463fddea
Commit
463fddea
authored
Jan 05, 2017
by
Filipa Lacerda
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Adds tests
Adds changelog entry Finishes tests Fix eslint errors Fix teaspoon test timing out
parent
2f0bbd3d
Changes
6
Show whitespace changes
Inline
Side-by-side
Showing
6 changed files
with
150 additions
and
5 deletions
+150
-5
app/assets/javascripts/environments/components/environment.js.es6
...ts/javascripts/environments/components/environment.js.es6
+2
-2
app/assets/javascripts/environments/stores/environments_store.js.es6
...javascripts/environments/stores/environments_store.js.es6
+2
-2
changelogs/unreleased/25507-handle-errors-environment-list.yml
...elogs/unreleased/25507-handle-errors-environment-list.yml
+4
-0
spec/javascripts/environments/environment_spec.js.es6
spec/javascripts/environments/environment_spec.js.es6
+127
-0
spec/javascripts/environments/mock_data.js.es6
spec/javascripts/environments/mock_data.js.es6
+14
-0
spec/javascripts/fixtures/environments/environments.html.haml
.../javascripts/fixtures/environments/environments.html.haml
+1
-1
No files found.
app/assets/javascripts/environments/components/environment.js.es6
View file @
463fddea
...
@@ -193,7 +193,7 @@
...
@@ -193,7 +193,7 @@
<div class="blank-state blank-state-no-icon"
<div class="blank-state blank-state-no-icon"
v-if="!isLoading && state.environments.length === 0">
v-if="!isLoading && state.environments.length === 0">
<h2 class="blank-state-title">
<h2 class="blank-state-title
js-blank-state-title
">
You don't have any environments right now.
You don't have any environments right now.
</h2>
</h2>
<p class="blank-state-text">
<p class="blank-state-text">
...
@@ -207,7 +207,7 @@
...
@@ -207,7 +207,7 @@
<a
<a
v-if="canCreateEnvironmentParsed"
v-if="canCreateEnvironmentParsed"
:href="newEnvironmentPath"
:href="newEnvironmentPath"
class="btn btn-create">
class="btn btn-create
js-new-environment-button
">
New Environment
New Environment
</a>
</a>
</div>
</div>
...
...
app/assets/javascripts/environments/stores/environments_store.js.es6
View file @
463fddea
...
@@ -59,7 +59,7 @@
...
@@ -59,7 +59,7 @@
if (occurs.length) {
if (occurs.length) {
acc[acc.indexOf(occurs[0])].children.push(environment);
acc[acc.indexOf(occurs[0])].children.push(environment);
acc[acc.indexOf(occurs[0])].children.sort(this.sortByName);
acc[acc.indexOf(occurs[0])].children.s
lice().s
ort(this.sortByName);
} else {
} else {
acc.push({
acc.push({
name: environment.environment_type,
name: environment.environment_type,
...
@@ -73,7 +73,7 @@
...
@@ -73,7 +73,7 @@
}
}
return acc;
return acc;
}, []).sort(this.sortByName);
}, []).s
lice().s
ort(this.sortByName);
this.state.environments = environmentsTree;
this.state.environments = environmentsTree;
...
...
changelogs/unreleased/25507-handle-errors-environment-list.yml
0 → 100644
View file @
463fddea
---
title
:
Handle HTTP errors in environment list
merge_request
:
author
:
spec/javascripts/environments/environment_spec.js.es6
0 → 100644
View file @
463fddea
/* global Vue, environment */
//= require vue
//= require vue-resource
//= require flash
//= require environments/stores/environments_store
//= require environments/components/environment
//= require ./mock_data
describe('Environment', () => {
preloadFixtures('environments/environments');
let component;
beforeEach(() => {
loadFixtures('environments/environments');
});
describe('successfull request', () => {
describe('without environments', () => {
const environmentsEmptyResponseInterceptor = (request, next) => {
next(request.respondWith(JSON.stringify([]), {
status: 200,
}));
};
beforeEach(() => {
Vue.http.interceptors.push(environmentsEmptyResponseInterceptor);
});
afterEach(() => {
Vue.http.interceptors = _.without(
Vue.http.interceptors, environmentsEmptyResponseInterceptor,
);
});
it('should render the empty state', (done) => {
component = new gl.environmentsList.EnvironmentsComponent({
el: document.querySelector('#environments-list-view'),
propsData: {
store: gl.environmentsList.EnvironmentsStore.create(),
},
});
setTimeout(() => {
expect(
component.$el.querySelector('.js-new-environment-button').textContent,
).toContain('New Environment');
expect(
component.$el.querySelector('.js-blank-state-title').textContent,
).toContain('You don\'t have any environments right now.');
done();
}, 0);
});
});
describe('with environments', () => {
const environmentsResponseInterceptor = (request, next) => {
next(request.respondWith(JSON.stringify([environment]), {
status: 200,
}));
};
beforeEach(() => {
Vue.http.interceptors.push(environmentsResponseInterceptor);
});
afterEach(() => {
Vue.http.interceptors = _.without(
Vue.http.interceptors, environmentsResponseInterceptor,
);
});
it('should render a table with environments', (done) => {
component = new gl.environmentsList.EnvironmentsComponent({
el: document.querySelector('#environments-list-view'),
propsData: {
store: gl.environmentsList.EnvironmentsStore.create(),
},
});
setTimeout(() => {
expect(
component.$el.querySelectorAll('table tbody tr').length,
).toEqual(1);
done();
}, 0);
});
});
});
describe('unsuccessfull request', () => {
const environmentsErrorResponseInterceptor = (request, next) => {
next(request.respondWith(JSON.stringify([]), {
status: 500,
}));
};
beforeEach(() => {
Vue.http.interceptors.push(environmentsErrorResponseInterceptor);
});
afterEach(() => {
Vue.http.interceptors = _.without(
Vue.http.interceptors, environmentsErrorResponseInterceptor,
);
});
it('should render empty state', (done) => {
component = new gl.environmentsList.EnvironmentsComponent({
el: document.querySelector('#environments-list-view'),
propsData: {
store: gl.environmentsList.EnvironmentsStore.create(),
},
});
setTimeout(() => {
expect(
component.$el.querySelector('.js-blank-state-title').textContent,
).toContain('You don\'t have any environments right now.');
done();
}, 0);
});
});
});
spec/javascripts/environments/mock_data.js.es6
View file @
463fddea
...
@@ -133,3 +133,17 @@ const environmentsList = [
...
@@ -133,3 +133,17 @@ const environmentsList = [
updated_at: '2016-11-07T11:11:16.525Z',
updated_at: '2016-11-07T11:11:16.525Z',
},
},
];
];
const environment = {
id: 4,
name: 'production',
state: 'available',
external_url: 'http://production.',
environment_type: null,
last_deployment: {},
'stoppable?': false,
environment_path: '/root/review-app/environments/4',
stop_path: '/root/review-app/environments/4/stop',
created_at: '2016-12-16T11:51:04.690Z',
updated_at: '2016-12-16T12:04:51.133Z',
};
spec/javascripts/fixtures/environments/environments.html.haml
View file @
463fddea
%div
%div
#environments-list-view
{
data:
{
environments_data:
"
https://gitlab.com/
foo/environments"
,
#environments-list-view
{
data:
{
environments_data:
"foo/environments"
,
"can-create-deployment"
=>
"true"
,
"can-create-deployment"
=>
"true"
,
"can-read-environment"
=>
"true"
,
"can-read-environment"
=>
"true"
,
"can-create-environment"
=>
"true"
,
"can-create-environment"
=>
"true"
,
...
...
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