Adds tests
Adds changelog entry Finishes tests Fix eslint errors Fix teaspoon test timing out
This commit is contained in:
parent
2f0bbd3d1d
commit
463fddeafc
|
@ -193,7 +193,7 @@
|
|||
|
||||
<div class="blank-state blank-state-no-icon"
|
||||
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.
|
||||
</h2>
|
||||
<p class="blank-state-text">
|
||||
|
@ -207,7 +207,7 @@
|
|||
<a
|
||||
v-if="canCreateEnvironmentParsed"
|
||||
:href="newEnvironmentPath"
|
||||
class="btn btn-create">
|
||||
class="btn btn-create js-new-environment-button">
|
||||
New Environment
|
||||
</a>
|
||||
</div>
|
||||
|
|
|
@ -59,7 +59,7 @@
|
|||
|
||||
if (occurs.length) {
|
||||
acc[acc.indexOf(occurs[0])].children.push(environment);
|
||||
acc[acc.indexOf(occurs[0])].children.sort(this.sortByName);
|
||||
acc[acc.indexOf(occurs[0])].children.slice().sort(this.sortByName);
|
||||
} else {
|
||||
acc.push({
|
||||
name: environment.environment_type,
|
||||
|
@ -73,7 +73,7 @@
|
|||
}
|
||||
|
||||
return acc;
|
||||
}, []).sort(this.sortByName);
|
||||
}, []).slice().sort(this.sortByName);
|
||||
|
||||
this.state.environments = environmentsTree;
|
||||
|
||||
|
|
|
@ -0,0 +1,4 @@
|
|||
---
|
||||
title: Handle HTTP errors in environment list
|
||||
merge_request:
|
||||
author:
|
|
@ -0,0 +1,127 @@
|
|||
/* 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);
|
||||
});
|
||||
});
|
||||
});
|
|
@ -133,3 +133,17 @@ const environmentsList = [
|
|||
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',
|
||||
};
|
||||
|
|
|
@ -1,5 +1,5 @@
|
|||
%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-read-environment" => "true",
|
||||
"can-create-environment" => "true",
|
||||
|
|
Loading…
Reference in New Issue