[WIP] E2e/sorting (#36) (#39)

jonshaffer · web-flow · commit f5f3115bbd78 · 2017-01-05T15:08:29.000-05:00
* E2e/sorting (#36) * Initial version of the e2e tests for multiple column sorting * Added test for single column sorting * Remove initial e2e setup test * Refactored duplicate code from sorting e2e tests * Remove whitespace from tests * perf change to default options * release files * fixed readme, added e2e to npm scripts * updated e2e npm script * adding to eslintignore, adding protractor to eslint * updated protractor conf, moved e2e files to test/protractor/ * moved protractor plugin to protractor folder, updated tests * removed .count()
diff --git a/.eslintignore b/.eslintignore
@@ -3,3 +3,5 @@ node_modules
 jspm_packages
 bower_components
 release
+dist
+test/coverage
diff --git a/README.md b/README.md
@@ -12,7 +12,7 @@
 
 It was engineered from its conception to handle thousands of rows without sacrificing performance.  It was built for modern browsers using _ES6, CSS3 and HTML5_ and **only supports [Evergreen Browsers](http://eisenbergeffect.bluespire.com/evergreen-browsers/) and Angular >= 1.4.x and < 2.0.0**.
 
-Sadly, this project is **not Angular2 upgrade compatible**. Fortunately, we have authored [angular2-data-table](https://github.com/swimlane/angular2-data-table) which is the successor to this project. **We are going to slowly be transitioning this project maintenance mode**. We will continue to provide feedback to the community and accept PRs but we won't be doing any major new development.
+Sadly, this project is **not Angular2 upgrade compatible**. Swimlane has authored an Angular 2 compatible table here: [angular2-data-table](https://github.com/swimlane/angular2-data-table) which is the successor to this project. ~~**We are going to slowly be transitioning this project maintenance mode**. We will continue to provide feedback to the community and accept PRs but we won't be doing any major new development.~~ Major new development is happening on this fork and there will be breaking changes, appropriately noted with [semvar](http://semver.org/) versioning.
 
 See live demos [here]( http://jonshaffer.github.io/angular-data-table/).
 
diff --git a/config.js b/config.js
@@ -1,84 +1,84 @@
 System.config({
-  baseURL: "",
+  baseURL: '',
   defaultJSExtensions: true,
-  transpiler: "babel",
+  transpiler: 'babel',
   babelOptions: {
-    "optional": [
-      "runtime"
+    'optional': [
+      'runtime'
     ]
   },
   paths: {
-    "*": "dist/*.js",
-    "github:*": "jspm_packages/github/*",
-    "npm:*": "jspm_packages/npm/*"
+    '*': 'dist/*.js',
+    'github:*': 'jspm_packages/github/*',
+    'npm:*': 'jspm_packages/npm/*'
   },
 
   map: {
-    "angular": "npm:angular@1.5.8",
-    "babel": "npm:babel-core@5.8.38",
-    "babel-runtime": "npm:babel-runtime@5.8.38",
-    "core-js": "npm:core-js@1.2.7",
-    "github:jspm/nodelibs-assert@0.1.0": {
-      "assert": "npm:assert@1.4.1"
+    'angular': 'npm:angular@1.5.8',
+    'babel': 'npm:babel-core@5.8.38',
+    'babel-runtime': 'npm:babel-runtime@5.8.38',
+    'core-js': 'npm:core-js@1.2.7',
+    'github:jspm/nodelibs-assert@0.1.0': {
+      'assert': 'npm:assert@1.4.1'
     },
-    "github:jspm/nodelibs-buffer@0.1.0": {
-      "buffer": "npm:buffer@3.6.0"
+    'github:jspm/nodelibs-buffer@0.1.0': {
+      'buffer': 'npm:buffer@3.6.0'
     },
-    "github:jspm/nodelibs-path@0.1.0": {
-      "path-browserify": "npm:path-browserify@0.0.0"
+    'github:jspm/nodelibs-path@0.1.0': {
+      'path-browserify': 'npm:path-browserify@0.0.0'
     },
-    "github:jspm/nodelibs-process@0.1.2": {
-      "process": "npm:process@0.11.9"
+    'github:jspm/nodelibs-process@0.1.2': {
+      'process': 'npm:process@0.11.9'
     },
-    "github:jspm/nodelibs-util@0.1.0": {
-      "util": "npm:util@0.10.3"
+    'github:jspm/nodelibs-util@0.1.0': {
+      'util': 'npm:util@0.10.3'
     },
-    "github:jspm/nodelibs-vm@0.1.0": {
-      "vm-browserify": "npm:vm-browserify@0.0.4"
+    'github:jspm/nodelibs-vm@0.1.0': {
+      'vm-browserify': 'npm:vm-browserify@0.0.4'
     },
-    "npm:angular@1.5.8": {
-      "process": "github:jspm/nodelibs-process@0.1.2"
+    'npm:angular@1.5.8': {
+      'process': 'github:jspm/nodelibs-process@0.1.2'
     },
-    "npm:assert@1.4.1": {
-      "assert": "github:jspm/nodelibs-assert@0.1.0",
-      "buffer": "github:jspm/nodelibs-buffer@0.1.0",
-      "process": "github:jspm/nodelibs-process@0.1.2",
-      "util": "npm:util@0.10.3"
+    'npm:assert@1.4.1': {
+      'assert': 'github:jspm/nodelibs-assert@0.1.0',
+      'buffer': 'github:jspm/nodelibs-buffer@0.1.0',
+      'process': 'github:jspm/nodelibs-process@0.1.2',
+      'util': 'npm:util@0.10.3'
     },
-    "npm:babel-runtime@5.8.38": {
-      "process": "github:jspm/nodelibs-process@0.1.2"
+    'npm:babel-runtime@5.8.38': {
+      'process': 'github:jspm/nodelibs-process@0.1.2'
     },
-    "npm:buffer@3.6.0": {
-      "base64-js": "npm:base64-js@0.0.8",
-      "child_process": "github:jspm/nodelibs-child_process@0.1.0",
-      "fs": "github:jspm/nodelibs-fs@0.1.2",
-      "ieee754": "npm:ieee754@1.1.8",
-      "isarray": "npm:isarray@1.0.0",
-      "process": "github:jspm/nodelibs-process@0.1.2"
+    'npm:buffer@3.6.0': {
+      'base64-js': 'npm:base64-js@0.0.8',
+      'child_process': 'github:jspm/nodelibs-child_process@0.1.0',
+      'fs': 'github:jspm/nodelibs-fs@0.1.2',
+      'ieee754': 'npm:ieee754@1.1.8',
+      'isarray': 'npm:isarray@1.0.0',
+      'process': 'github:jspm/nodelibs-process@0.1.2'
     },
-    "npm:core-js@1.2.7": {
-      "fs": "github:jspm/nodelibs-fs@0.1.2",
-      "path": "github:jspm/nodelibs-path@0.1.0",
-      "process": "github:jspm/nodelibs-process@0.1.2",
-      "systemjs-json": "github:systemjs/plugin-json@0.1.2"
+    'npm:core-js@1.2.7': {
+      'fs': 'github:jspm/nodelibs-fs@0.1.2',
+      'path': 'github:jspm/nodelibs-path@0.1.0',
+      'process': 'github:jspm/nodelibs-process@0.1.2',
+      'systemjs-json': 'github:systemjs/plugin-json@0.1.2'
     },
-    "npm:inherits@2.0.1": {
-      "util": "github:jspm/nodelibs-util@0.1.0"
+    'npm:inherits@2.0.1': {
+      'util': 'github:jspm/nodelibs-util@0.1.0'
     },
-    "npm:path-browserify@0.0.0": {
-      "process": "github:jspm/nodelibs-process@0.1.2"
+    'npm:path-browserify@0.0.0': {
+      'process': 'github:jspm/nodelibs-process@0.1.2'
     },
-    "npm:process@0.11.9": {
-      "assert": "github:jspm/nodelibs-assert@0.1.0",
-      "fs": "github:jspm/nodelibs-fs@0.1.2",
-      "vm": "github:jspm/nodelibs-vm@0.1.0"
+    'npm:process@0.11.9': {
+      'assert': 'github:jspm/nodelibs-assert@0.1.0',
+      'fs': 'github:jspm/nodelibs-fs@0.1.2',
+      'vm': 'github:jspm/nodelibs-vm@0.1.0'
     },
-    "npm:util@0.10.3": {
-      "inherits": "npm:inherits@2.0.1",
-      "process": "github:jspm/nodelibs-process@0.1.2"
+    'npm:util@0.10.3': {
+      'inherits': 'npm:inherits@2.0.1',
+      'process': 'github:jspm/nodelibs-process@0.1.2'
     },
-    "npm:vm-browserify@0.0.4": {
-      "indexof": "npm:indexof@0.0.1"
+    'npm:vm-browserify@0.0.4': {
+      'indexof': 'npm:indexof@0.0.1'
     }
   }
 });
diff --git a/package.json b/package.json
@@ -26,9 +26,10 @@
     }
   ],
   "scripts": {
-    "start": "node ./node_modules/gulp/bin/gulp.js watch serve",
+    "start": "node ./node_modules/gulp/bin/gulp.js serve watch",
     "release": "node ./node_modules/gulp/bin/gulp.js release",
     "test": "node ./node_modules/gulp/bin/gulp.js test",
+    "e2e": "protractor test/protractor.conf.js",
     "report-coverage": "codecov"
   },
   "peerDependencies": {
@@ -53,7 +54,9 @@
     "browser-sync": "^2.7.2",
     "browserify": "^13.1.1",
     "browserify-istanbul": "^2.0.0",
+    "codecov": "^1.0.1",
     "del": "^2.2.0",
+    "eslint-plugin-protractor": "^1.32.0",
     "gulp": "^3.8.11",
     "gulp-angular-protractor": "^0.3.0",
     "gulp-babel": "6.1.2",
diff --git a/release/dataTable.cjs.js b/release/dataTable.cjs.js
diff --git a/release/dataTable.es6.js b/release/dataTable.es6.js
@@ -726,10 +726,10 @@ class DataTableController {
   /**
    * Creates and extends default options for the grid control
    */
-  defaults(){
+  defaults() {
     this.expanded = this.expanded || {};
 
-    this.options = angular.extend(angular.copy(TableDefaults), this.options);
+    this.options = Object.assign({}, TableDefaults, this.options);
 
     angular.forEach(TableDefaults.paging, (v,k) => {
       if(!this.options.paging[k]){
diff --git a/release/dataTable.js b/release/dataTable.js
diff --git a/release/dataTable.min.js b/release/dataTable.min.js
diff --git a/src/components/DataTableController.js b/src/components/DataTableController.js
@@ -54,10 +54,10 @@ export class DataTableController {
   /**
    * Creates and extends default options for the grid control
    */
-  defaults(){
+  defaults() {
     this.expanded = this.expanded || {};
 
-    this.options = angular.extend(angular.copy(TableDefaults), this.options);
+    this.options = Object.assign({}, TableDefaults, this.options);
 
     angular.forEach(TableDefaults.paging, (v,k) => {
       if(!this.options.paging[k]){
diff --git a/test/protractor.conf.js b/test/protractor.conf.js
@@ -1,6 +1,7 @@
 const config = {
   framework: 'jasmine',
-  specs: ['../src/**/*.e2e.js']
+  specs: ['./protractor/*.e2e.js'],
+  baseUrl: 'http://localhost:9000/'
 };
 
 if (process.env.TRAVIS) {
diff --git a/test/protractor/.eslintrc b/test/protractor/.eslintrc
@@ -0,0 +1,4 @@
+{
+  "plugins": ["protractor"],
+  "extends": "plugin:protractor/recommended"
+}
diff --git a/test/protractor/Basic.e2e.js b/test/protractor/Basic.e2e.js
@@ -1,5 +1,5 @@
-describe('DataTable: Basic Demo', function () {
-  browser.get('http://localhost:9000/demos/basic.html');
+describe('When Basic:', function () {
+  browser.get('/demos/basic.html');
 
   it('should display table body', () => {
     element.all(by.css('.dt-body')).then((items) => {
diff --git a/test/protractor/Paging.e2e.js b/test/protractor/Paging.e2e.js
@@ -1,5 +1,5 @@
-describe('PagerDirective', function () {
-  browser.get('http://localhost:9000/demos/paging.html');
+describe('When Paging:', function () {
+  browser.get('/demos/paging.html');
 
   it('should have active class on first pager', () => {
     element.all(by.css('ul.pager li')).then(function(items) {
diff --git a/test/protractor/Sorting.e2e.js b/test/protractor/Sorting.e2e.js
@@ -0,0 +1,55 @@
+describe('When Sorting:', function () {
+    var hasClass = function (element, cls) {
+      return element.getAttribute('class').then(function (classes) {
+        return classes.split(' ').indexOf(cls) !== -1;
+      });
+    }
+
+      var colHeaderList,
+          colHeader1,
+          colHeader1Icon,
+          colHeader2,
+          colHeader2Icon,
+          row1Column1;
+
+      beforeEach(function () {
+           browser.get('/demos/sort.html');
+
+           colHeaderList = by.repeater('column in header.columns[\'center\'] track by column.$id');
+           colHeader1 = element(colHeaderList.row(0));
+           colHeader1Icon = colHeader1.element(by.css('.sort-btn'));
+           colHeader2 = element(colHeaderList.row(1));
+           colHeader2Icon = colHeader2.element(by.css('.sort-btn'));
+           row1Column1 = element.all(by.css('.dt-cell')).first();
+      });
+
+      describe('multi column', function () {
+          it('should be able to sort by multiple columns', function() {
+              colHeader1.click();
+
+              expect(hasClass(colHeader1Icon, 'icon-up')).toBe(true);
+              expect(hasClass(colHeader2Icon, 'icon-down')).toBe(true);
+              expect(row1Column1.getText()).toBe('Valarie Atkinson');
+          });
+      });
+
+      describe('single column', function () {
+          beforeEach(function () {
+              element(by.model('multiple')).click();
+          });
+
+          it('should only sort by one column at a time', function () {
+              colHeader2.click();
+
+              setTimeout(function () {
+                  colHeader1.click();
+              }, 10);
+
+              setTimeout(function () {
+                  expect(hasClass(colHeader1Icon, 'icon-up')).toBe(true);
+                  expect(hasClass(colHeader2Icon, 'icon-down')).toBe(false);
+                  expect(row1Column1.getText()).toBe('Wilder Gonzales');
+              }, 10);
+          });
+      });
+});
