From 26a951b7ab272b80df1281464aaf656570fe214e Mon Sep 17 00:00:00 2001 From: Filipa Lacerda Date: Thu, 9 Feb 2017 11:35:53 +0000 Subject: [PATCH] Use CJS for tests. Updates expected model in tests --- .../stores/environments_store.js.es6 | 1 - .../environments/environment_item_spec.js.es6 | 8 +++- .../environments/environment_spec.js.es6 | 18 +++------ .../environments_store_spec.js.es6 | 37 ++++++++++--------- .../javascripts/environments/mock_data.js.es6 | 8 ++-- 5 files changed, 36 insertions(+), 36 deletions(-) diff --git a/app/assets/javascripts/environments/stores/environments_store.js.es6 b/app/assets/javascripts/environments/stores/environments_store.js.es6 index 52bd6b94551..749dd882188 100644 --- a/app/assets/javascripts/environments/stores/environments_store.js.es6 +++ b/app/assets/javascripts/environments/stores/environments_store.js.es6 @@ -10,7 +10,6 @@ class EnvironmentsStore { this.state.environments = []; this.state.stoppedCounter = 0; this.state.availableCounter = 0; - this.state.filteredEnvironments = []; return this; } diff --git a/spec/javascripts/environments/environment_item_spec.js.es6 b/spec/javascripts/environments/environment_item_spec.js.es6 index 14478f1401d..5dc7ef5ad76 100644 --- a/spec/javascripts/environments/environment_item_spec.js.es6 +++ b/spec/javascripts/environments/environment_item_spec.js.es6 @@ -1,7 +1,7 @@ window.timeago = require('vendor/timeago'); require('~/environments/components/environment_item'); -describe('Environment item', () => { +fdescribe('Environment item', () => { preloadFixtures('static/environments/table.html.raw'); beforeEach(() => { loadFixtures('static/environments/table.html.raw'); @@ -14,7 +14,11 @@ describe('Environment item', () => { beforeEach(() => { mockItem = { name: 'review', - size: 3 + size: 3, + isFolder: true, + latest: { + environment_path: 'url', + }, }; component = new window.gl.environmentsList.EnvironmentItem({ diff --git a/spec/javascripts/environments/environment_spec.js.es6 b/spec/javascripts/environments/environment_spec.js.es6 index 87eda136122..8b96f4b09db 100644 --- a/spec/javascripts/environments/environment_spec.js.es6 +++ b/spec/javascripts/environments/environment_spec.js.es6 @@ -1,9 +1,8 @@ /* global Vue, environment */ require('~/flash'); -require('~/environments/stores/environments_store'); require('~/environments/components/environment'); -require('./mock_data'); +const { environment } = require('./mock_data'); describe('Environment', () => { preloadFixtures('static/environments/environments.html.raw'); @@ -35,9 +34,6 @@ describe('Environment', () => { 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(() => { @@ -56,7 +52,11 @@ describe('Environment', () => { describe('with environments', () => { 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, })); }; @@ -74,9 +74,6 @@ describe('Environment', () => { 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(() => { @@ -109,9 +106,6 @@ describe('Environment', () => { it('should render empty state', (done) => { component = new gl.environmentsList.EnvironmentsComponent({ el: document.querySelector('#environments-list-view'), - propsData: { - store: gl.environmentsList.EnvironmentsStore.create(), - }, }); setTimeout(() => { diff --git a/spec/javascripts/environments/environments_store_spec.js.es6 b/spec/javascripts/environments/environments_store_spec.js.es6 index ef4b06dea40..861136c621f 100644 --- a/spec/javascripts/environments/environments_store_spec.js.es6 +++ b/spec/javascripts/environments/environments_store_spec.js.es6 @@ -1,30 +1,33 @@ -/* global environmentsList */ - -require('~/environments/stores/environments_store'); -require('./mock_data'); +const Store = require('~/environments/stores/environments_store'); +const { environmentsList } = require('./mock_data'); (() => { describe('Store', () => { + let store; + beforeEach(() => { - gl.environmentsList.EnvironmentsStore.create(); + store = new Store(); }); it('should start with a blank state', () => { - expect(gl.environmentsList.EnvironmentsStore.state.environments.length).toBe(0); - expect(gl.environmentsList.EnvironmentsStore.state.stoppedCounter).toBe(0); - expect(gl.environmentsList.EnvironmentsStore.state.availableCounter).toBe(0); + expect(store.state.environments.length).toBe(0); + expect(store.state.stoppedCounter).toBe(0); + expect(store.state.availableCounter).toBe(0); }); - describe('store environments', () => { - beforeEach(() => { - gl.environmentsList.EnvironmentsStore.storeEnvironments(environmentsList); - }); + it('should store environments', () => { + store.storeEnvironments(environmentsList); + expect(store.state.environments.length).toBe(environmentsList.length); + }); - it('should store environments', () => { - expect( - gl.environmentsList.EnvironmentsStore.state.environments.length, - ).toBe(environmentsList.length); - }); + it('should store available count', () => { + store.storeAvailableCount(2); + expect(store.state.availableCounter).toBe(2); + }); + + it('should store stopped count', () => { + store.storeStoppedCount(2); + expect(store.state.stoppedCounter).toBe(2); }); }); })(); diff --git a/spec/javascripts/environments/mock_data.js.es6 b/spec/javascripts/environments/mock_data.js.es6 index 91595c049b0..bdecc95d219 100644 --- a/spec/javascripts/environments/mock_data.js.es6 +++ b/spec/javascripts/environments/mock_data.js.es6 @@ -1,4 +1,3 @@ - const environmentsList = [ { name: 'DEV', @@ -36,8 +35,6 @@ const environmentsList = [ }, ]; -window.environmentsList = environmentsList; - const environment = { name: 'DEV', size: 1, @@ -56,4 +53,7 @@ const environment = { }, }; -window.environment = environment; +module.exports = { + environmentsList, + environment +};