continue tests

.travis.yml

@@ -5,4 +5,6 @@ install:
   - npm install    
 script:
   - npm run test-client
-  - npm run test-server
+  - npm run test-client-vuex
+  - npm run test-server
+  - npm run test-server-vuex

package.json

@@ -28,8 +28,10 @@
   "scripts": {
     "build": "babel lib -d compiled",
     "test-client": "cross-env NODE_ENV=test mocha-webpack --webpack-config webpack.config.js --require test/setup/setup.js test/setup/client-setup.js test/*.spec.js test/client/*.spec.js",
+    "test-client-vuex": "cross-env NODE_ENV=test mocha-webpack --webpack-config webpack.config.js --require test/setup/setup.js test/setup/with-vuex.js test/setup/client-setup.js test/*.spec.js test/client/*.spec.js",
     "watch-client": "cross-env NODE_ENV=test mocha-webpack --webpack-config webpack.config.js --watch --require test/setup/setup.js test/setup/client-setup.js test/*.spec.js test/client/*.spec.js",
     "test-server": "cross-env NODE_ENV=test mocha-webpack --webpack-config webpack.config.js --require test/setup/setup.js test/setup/server-setup.js test/*.spec.js test/server/*.spec.js",
+    "test-server-vuex": "cross-env NODE_ENV=test mocha-webpack --webpack-config webpack.config.js --require test/setup/setup.js test/setup/with-vuex.js test/setup/server-setup.js test/*.spec.js test/server/*.spec.js",
     "watch-server": "cross-env NODE_ENV=test mocha-webpack --webpack-config webpack.config.js --watch --require test/setup/setup.js test/setup/server-setup.js test/*.spec.js test/server/*.spec.js"
   },
   "license": "MIT",

test/child-row.spec.js

@@ -1,13 +1,13 @@
 import childRow from './setup/ChildRow.vue';
+import {mount} from 'vue-test-utils';
 
 describe(suite + ': Child row', () => {
 
 	var firstRowToggler = 'table tbody tr td:first-child span'; 
 
 	beforeEach(()=>{
-
 		setOptions({
-			childRow,
+			childRow
 		});
 
 	});
@@ -80,5 +80,39 @@ describe(suite + ': Child row', () => {
 
 	});
 
+	it('can position the toggler in the last column', (done)=>{
+
+		setOptions({
+			childRow,
+			childRowTogglerFirst:false
+		});
+
+		run(function() {
+			not_exists('table tbody tr td:first-child .VueTables__child-row-toggler');
+			exists('table tbody tr td:last-child .VueTables__child-row-toggler');
+		},done);
+
+
+	});
+
+	// it.only('only mount the clicked row, without remounting other open rows (regression test for issue #272)', (done)=>{
+
+	// 	// The issue only occurs with open rows that come AFTER the clicked row 
+
+	// 	const FIRST_ROW_ID = 245;
+	// 	const SECOND_ROW_ID = 244;
+
+	// 	vm().toggleChildRow(SECOND_ROW_ID); 
+
+	// 	setTimeout(()=>{
+	// 		vm().toggleChildRow(FIRST_ROW_ID);
+	// 	},100);
+
+	// 	run(()=>{			
+	// 		console.log(wrapper.emitted());
+	// 		expect(wrapper.emitted().mounted_child_row.length).toBe(2);
+	// 	},done,1000);
+
+	// });
 
 });

test/display.spec.js

@@ -1,5 +1,5 @@
 describe(suite +': Basic Display (default options)', () => {
-
+	
 	var records = 50;
 
 	it('Discerns the headings based on the columns prop', () => {

test/filters.spec.js

@@ -0,0 +1,38 @@
+describe(suite  + ': Filters (Common)', function() {
+	it('can display column filters', ()=>{
+
+		createWrapper({filterByColumn:true});
+
+		exists('.VueTables__filters-row');
+		exists('[name="vf__code"]');
+		exists('[name="vf__name"]');
+		exists('[name="vf__uri"]');
+
+	});
+
+	it('can display list filters', ()=>{
+
+		createWrapper({
+			filterByColumn:true, 
+			listColumns:{
+				id:[
+				{
+					id:245,
+					text:'Zimbabwe'
+				},
+				{
+					id:244,
+					text:'Zambia'
+				}
+				]
+			}}, ['id','name','code','uri']);
+
+
+			exists('.VueTables__filters-row select[name="vf__id"]');
+			see('Select id', '.VueTables__filters-row select[name="vf__id"] option:first-child');
+			see('Zimbabwe', '.VueTables__filters-row select[name="vf__id"] option:nth-child(2)');
+			see('Zambia', '.VueTables__filters-row select[name="vf__id"] option:nth-child(3)');
+
+	});
+
+});

test/server/request.spec.js

@@ -1,4 +1,4 @@
-describe('Server: Request', () => {
+describe(suite + ': Request', () => {
 
 	var initialParams = { 
 		query: '', 

test/setup/ChildRow.vue

@@ -5,7 +5,13 @@
 </template>
 
 <script>
+	
 	export default {
-		props:['data']
+		name:'ChildRow',
+		props:['data'],
+		mounted() {
+			// console.log(this.$parent.$data);
+			this.$parent.$emit(`mounted_child_row`, this.data.id);
+		}
 	}	
 </script>

test/setup/client-setup.js

@@ -1,25 +1,45 @@
 
 import Vue from 'vue'
+import Vuex from 'vuex'
 import { mount } from 'vue-test-utils'
 import ClientTable from '../../compiled/v-client-table'
+import {Event} from '../../compiled/index.js';
 import data from './example-data'
 
+global.VueEvent = Event;
 global.suite = 'Client';
 
-global.run = function(cb, done) {
+if (withVuex()) {
+	suite+=" - Vuex";	
+	Vue.use(Vuex);
+}
+
+global.run = function(cb, done, timeout = 0) {
 	setTimeout(()=>{
 		cb();
 		done();
-	}, 0);
+	},timeout);
 }
 
 beforeEach(function() {
-	global.wrapper = mount(ClientTable.install(Vue), {
+	createWrapper();
+});
+
+global.createWrapper = function(options = {}, columns = null) {
+
+	let params = {
 		propsData:{
-			columns:['code','name','uri'],
+			name:'client',
+			columns:columns?columns:['code','name','uri'],
 			data,
-			options:{}
+			options
 		}
-	});
-});
+	};
+
+	if (withVuex()) {
+		params.store =  new Vuex.Store();	
+	}
+
+	global.wrapper = mount(ClientTable.install(Vue,{},withVuex()), params);
+}
 

test/setup/server-setup.js

@@ -1,4 +1,5 @@
 import Vue from 'vue'
+import Vuex from 'vuex'
 import { mount } from 'vue-test-utils'
 import ServerTable from '../../compiled/v-server-table.js'
 
@@ -8,6 +9,11 @@ global.moxios = require('moxios');
 
 import data from './example-data';
 
+if (withVuex()) {
+	Vue.use(Vuex);
+	suite+=' - Vuex';
+}
+
 beforeEach(()=>{
 	moxios.install(axios);
 
@@ -18,16 +24,9 @@ beforeEach(()=>{
 			count:data.length
 		}
 	});
-
-	global.wrapper = mount(ServerTable.install(Vue), {
-		propsData:{
-			columns:['code','name','uri'],
-			url:'get-data',
-			options:{}
-		}
-	});
-
 
+	createWrapper();
+
 });
 
 
@@ -42,3 +41,20 @@ global.run = function(cb, done) {
 	});
 }
 
+global.createWrapper = function(options = {}, columns = null) {
+
+	var params = {
+		propsData:{
+			name:'server',
+			columns:columns?columns:['code','name','uri'],
+			url:'get-data',
+			options
+		}
+	};
+
+	if (withVuex()) {
+		params.store = new Vuex.Store();
+	}
+
+	global.wrapper = mount(ServerTable.install(Vue, {} ,withVuex()), params);
+}

test/setup/setup.js

@@ -20,6 +20,9 @@ global.exists = function(selector) {
 	expect(wrapper.contains(selector)).toBe(true);
 }
 
+global.not_exists = function(selector) {
+	expect(wrapper.contains(selector)).toBe(false);
+}
 
 global.count = function(selector, count) {
 	expect(wrapper.findAll(selector)).toHaveLength(count);
@@ -33,5 +36,8 @@ global.click = function(selector) {
 	wrapper.find(selector).trigger('click');
 }
 
+global.withVuex = function() {
+	return typeof useVuex!='undefined';
+}
 
 

test/setup/with-vuex.js

@@ -0,0 +1 @@
+global.useVuex = true;