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
Jérome Perrin
gitlab-ce
Commits
26a951b7
Commit
26a951b7
authored
Feb 09, 2017
by
Filipa Lacerda
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Use CJS for tests.
Updates expected model in tests
parent
6077dea7
Changes
5
Show whitespace changes
Inline
Side-by-side
Showing
5 changed files
with
36 additions
and
36 deletions
+36
-36
app/assets/javascripts/environments/stores/environments_store.js.es6
...javascripts/environments/stores/environments_store.js.es6
+0
-1
spec/javascripts/environments/environment_item_spec.js.es6
spec/javascripts/environments/environment_item_spec.js.es6
+6
-2
spec/javascripts/environments/environment_spec.js.es6
spec/javascripts/environments/environment_spec.js.es6
+6
-12
spec/javascripts/environments/environments_store_spec.js.es6
spec/javascripts/environments/environments_store_spec.js.es6
+20
-17
spec/javascripts/environments/mock_data.js.es6
spec/javascripts/environments/mock_data.js.es6
+4
-4
No files found.
app/assets/javascripts/environments/stores/environments_store.js.es6
View file @
26a951b7
...
@@ -10,7 +10,6 @@ class EnvironmentsStore {
...
@@ -10,7 +10,6 @@ class EnvironmentsStore {
this.state.environments = [];
this.state.environments = [];
this.state.stoppedCounter = 0;
this.state.stoppedCounter = 0;
this.state.availableCounter = 0;
this.state.availableCounter = 0;
this.state.filteredEnvironments = [];
return this;
return this;
}
}
...
...
spec/javascripts/environments/environment_item_spec.js.es6
View file @
26a951b7
window.timeago = require('vendor/timeago');
window.timeago = require('vendor/timeago');
require('~/environments/components/environment_item');
require('~/environments/components/environment_item');
describe('Environment item', () => {
f
describe('Environment item', () => {
preloadFixtures('static/environments/table.html.raw');
preloadFixtures('static/environments/table.html.raw');
beforeEach(() => {
beforeEach(() => {
loadFixtures('static/environments/table.html.raw');
loadFixtures('static/environments/table.html.raw');
...
@@ -14,7 +14,11 @@ describe('Environment item', () => {
...
@@ -14,7 +14,11 @@ describe('Environment item', () => {
beforeEach(() => {
beforeEach(() => {
mockItem = {
mockItem = {
name: 'review',
name: 'review',
size: 3
size: 3,
isFolder: true,
latest: {
environment_path: 'url',
},
};
};
component = new window.gl.environmentsList.EnvironmentItem({
component = new window.gl.environmentsList.EnvironmentItem({
...
...
spec/javascripts/environments/environment_spec.js.es6
View file @
26a951b7
/* global Vue, environment */
/* global Vue, environment */
require('~/flash');
require('~/flash');
require('~/environments/stores/environments_store');
require('~/environments/components/environment');
require('~/environments/components/environment');
require('./mock_data');
const { environment } =
require('./mock_data');
describe('Environment', () => {
describe('Environment', () => {
preloadFixtures('static/environments/environments.html.raw');
preloadFixtures('static/environments/environments.html.raw');
...
@@ -35,9 +34,6 @@ describe('Environment', () => {
...
@@ -35,9 +34,6 @@ describe('Environment', () => {
it('should render the empty state', (done) => {
it('should render the empty state', (done) => {
component = new gl.environmentsList.EnvironmentsComponent({
component = new gl.environmentsList.EnvironmentsComponent({
el: document.querySelector('#environments-list-view'),
el: document.querySelector('#environments-list-view'),
propsData: {
store: gl.environmentsList.EnvironmentsStore.create(),
},
});
});
setTimeout(() => {
setTimeout(() => {
...
@@ -56,7 +52,11 @@ describe('Environment', () => {
...
@@ -56,7 +52,11 @@ describe('Environment', () => {
describe('with environments', () => {
describe('with environments', () => {
const environmentsResponseInterceptor = (request, next) => {
const environmentsResponseInterceptor = (request, next) => {
next(request.respondWith(JSON.stringify([environment]), {
next(request.respondWith(JSON.stringify({
environments: [environment],
stopped_count: 1,
available_count: 0,
}), {
status: 200,
status: 200,
}));
}));
};
};
...
@@ -74,9 +74,6 @@ describe('Environment', () => {
...
@@ -74,9 +74,6 @@ describe('Environment', () => {
it('should render a table with environments', (done) => {
it('should render a table with environments', (done) => {
component = new gl.environmentsList.EnvironmentsComponent({
component = new gl.environmentsList.EnvironmentsComponent({
el: document.querySelector('#environments-list-view'),
el: document.querySelector('#environments-list-view'),
propsData: {
store: gl.environmentsList.EnvironmentsStore.create(),
},
});
});
setTimeout(() => {
setTimeout(() => {
...
@@ -109,9 +106,6 @@ describe('Environment', () => {
...
@@ -109,9 +106,6 @@ describe('Environment', () => {
it('should render empty state', (done) => {
it('should render empty state', (done) => {
component = new gl.environmentsList.EnvironmentsComponent({
component = new gl.environmentsList.EnvironmentsComponent({
el: document.querySelector('#environments-list-view'),
el: document.querySelector('#environments-list-view'),
propsData: {
store: gl.environmentsList.EnvironmentsStore.create(),
},
});
});
setTimeout(() => {
setTimeout(() => {
...
...
spec/javascripts/environments/environments_store_spec.js.es6
View file @
26a951b7
/* global environmentsList */
const Store = require('~/environments/stores/environments_store');
const { environmentsList } = require('./mock_data');
require('~/environments/stores/environments_store');
require('./mock_data');
(() => {
(() => {
describe('Store', () => {
describe('Store', () => {
let store;
beforeEach(() => {
beforeEach(() => {
gl.environmentsList.EnvironmentsStore.creat
e();
store = new Stor
e();
});
});
it('should start with a blank state', () => {
it('should start with a blank state', () => {
expect(
gl.environmentsList.EnvironmentsS
tore.state.environments.length).toBe(0);
expect(
s
tore.state.environments.length).toBe(0);
expect(
gl.environmentsList.EnvironmentsS
tore.state.stoppedCounter).toBe(0);
expect(
s
tore.state.stoppedCounter).toBe(0);
expect(
gl.environmentsList.EnvironmentsS
tore.state.availableCounter).toBe(0);
expect(
s
tore.state.availableCounter).toBe(0);
});
});
describe('
store environments', () => {
it('should
store environments', () => {
beforeEach(() => {
store.storeEnvironments(environmentsList);
gl.environmentsList.EnvironmentsStore.storeEnvironments(environmentsList
);
expect(store.state.environments.length).toBe(environmentsList.length
);
});
});
it('should store environments', () => {
it('should store available count', () => {
expect(
store.storeAvailableCount(2);
gl.environmentsList.EnvironmentsStore.state.environments.length,
expect(store.state.availableCounter).toBe(2);
).toBe(environmentsList.length);
});
});
it('should store stopped count', () => {
store.storeStoppedCount(2);
expect(store.state.stoppedCounter).toBe(2);
});
});
});
});
})();
})();
spec/javascripts/environments/mock_data.js.es6
View file @
26a951b7
const environmentsList = [
const environmentsList = [
{
{
name: 'DEV',
name: 'DEV',
...
@@ -36,8 +35,6 @@ const environmentsList = [
...
@@ -36,8 +35,6 @@ const environmentsList = [
},
},
];
];
window.environmentsList = environmentsList;
const environment = {
const environment = {
name: 'DEV',
name: 'DEV',
size: 1,
size: 1,
...
@@ -56,4 +53,7 @@ const environment = {
...
@@ -56,4 +53,7 @@ const environment = {
},
},
};
};
window.environment = environment;
module.exports = {
environmentsList,
environment
};
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