Fix #2285 (tut, e2e): fixed e2e and extended tut for external sort

Author: PaulL1

Gruntfile.js

@@ -287,6 +287,7 @@ module.exports = function(grunt) {
           afterEach: false,
           before: false,
           beforeEach: false,
+          console: false,
           dump: false, 
           describe: false,
           ddescribe: false,

misc/tutorial/304_grid_menu.ngdoc

@@ -15,6 +15,9 @@ want them also internationalized in the grid menu.  The translate needs to retur
 or a promise that will resolve to a string.  In the example below we create a fake 
 internationalization function that waits 1 second then prefixes each column with "col: ".
 
+You can suppress the ability to show and hide columns by setting the gridOption `gridMenuShowHideColumns: false`,
+you can suppress the ability to hide individual columns by setting `enableHiding` on that columnDef to false.
+
 @example
 <example module="app">
   <file name="app.js">
@@ -33,7 +36,6 @@ internationalization function that waits 1 second then prefixes each column with
         exporterMenuCsv: false,
         enableGridMenu: true,
         gridMenuTitleFilter: fakeI18n,
-        gridMenuShowHideColumns: false,
         columnDefs: [
           { name: 'name' },
           { name: 'gender', enableHiding: false },
@@ -103,21 +105,21 @@ internationalization function that waits 1 second then prefixes each column with
       });
 
       it('grid1 grid menu should have 8 items', function () {
-        gridTestUtils.expectVisibleGridMenuItems( 'grid1', 8 );
+        gridTestUtils.expectVisibleGridMenuItems( 'grid1', 7 );
       });
 
-      it('grid1 hide then show gender column', function () {
+      it('grid1 hide then show company column', function () {
         gridTestUtils.expectHeaderColumnCount( 'grid1', 3 );
         gridTestUtils.expectHeaderCellValueMatch( 'grid1', 0, 'Name' );
         gridTestUtils.expectHeaderCellValueMatch( 'grid1', 1, 'Gender' );
         gridTestUtils.expectHeaderCellValueMatch( 'grid1', 2, 'Company' );
 
-        gridTestUtils.clickGridMenuItem( 'grid1', 11 );  // there are some hidden menu items, this is gender_hide
+        gridTestUtils.clickGridMenuItem( 'grid1', 11 );  // there are some hidden menu items, this is company_hide
         gridTestUtils.expectHeaderColumnCount( 'grid1', 2 );
         gridTestUtils.expectHeaderCellValueMatch( 'grid1', 0, 'Name' );
-        gridTestUtils.expectHeaderCellValueMatch( 'grid1', 1, 'Company' );
+        gridTestUtils.expectHeaderCellValueMatch( 'grid1', 1, 'Gender' );
 
-        gridTestUtils.clickGridMenuItem( 'grid1', 12 );  // there are some hidden menu items, this is gender_show
+        gridTestUtils.clickGridMenuItem( 'grid1', 12 );  // there are some hidden menu items, this is company_show
         gridTestUtils.expectHeaderColumnCount( 'grid1', 3 );
         gridTestUtils.expectHeaderCellValueMatch( 'grid1', 0, 'Name' );
         gridTestUtils.expectHeaderCellValueMatch( 'grid1', 1, 'Gender' );

misc/tutorial/307_external_sorting.ngdoc

@@ -16,6 +16,10 @@ json files to show - one sorted ASC, one sorted DESC, and one not sorted.  To fu
 is using external sorting, the external sort routine (consisting of me manually editing json files) got bored
 of sorting after the first 10 or so rows.
 
+We allow sorting by the first and second columns, so that we can show a default sort and that default sort
+indicator being removed even when using external sorting.  Our external sort routine ignores that second
+column however, so sorting by it has no effect. 
+
 <example module="app">
   <file name="app.js">
     var app = angular.module('app', ['ngTouch', 'ui.grid']);
@@ -26,13 +30,17 @@ of sorting after the first 10 or so rows.
         useExternalSorting: true,
         columnDefs: [
           { name: 'name' },
-          { name: 'gender', enableSorting: false},
+          { name: 'gender', sort: {
+              direction: uiGridConstants.DESC,
+              priority: 1
+            }
+          },
           { name: 'company', enableSorting: false}
         ],
         onRegisterApi: function( gridApi ) {
           $scope.gridApi = gridApi;
           $scope.gridApi.core.on.sortChanged( $scope, function( grid, sortColumns ) {
-            if( sortColumns.length === 0 ){
+            if( sortColumns.length === 0 || sortColumns[0].name !== $scope.gridOptions.columnDefs[0].name ){
               $http.get('/data/100.json')
               .success(function(data) {
                 $scope.gridOptions.data = data;
@@ -72,7 +80,7 @@ of sorting after the first 10 or so rows.
   </file>
   <file name="index.html">
     <div ng-controller="MainCtrl">
-      <div ui-grid="gridOptions" class="grid"></div>
+      <div id="grid1" ui-grid="gridOptions" class="grid"></div>
     </div>
   </file>
   <file name="main.css">
@@ -81,4 +89,57 @@ of sorting after the first 10 or so rows.
       height: 250px;
     }
   </file>
+    <file name="scenario.js">
+    var gridTestUtils = require('../../test/e2e/gridTestUtils.spec.js');
+    
+    describe('307 tutorial', function() {
+      it('grid should have three visible columns', function () {
+        gridTestUtils.expectHeaderColumnCount( 'grid1', 3 );
+      });
+  
+      it('header values should be as expected', function () {
+        gridTestUtils.expectHeaderCellValueMatch( 'grid1', 0, 'Name' );
+        gridTestUtils.expectHeaderCellValueMatch( 'grid1', 1, 'Gender' );
+        gridTestUtils.expectHeaderCellValueMatch( 'grid1', 2, 'Company' );
+      });
+  
+      it('grid should be unsorted by default', function () {
+        gridTestUtils.expectCellValueMatch( 'grid1', 0, 0, 'Ethel Price' );
+        gridTestUtils.expectCellValueMatch( 'grid1', 1, 0, 'Claudine Neal' );
+      });
+
+      it('sort by name by clicking header', function () {
+        gridTestUtils.clickHeaderCell( 'grid1', 0 );
+        gridTestUtils.expectCellValueMatch( 'grid1', 0, 0, 'Beryl Rice' );
+        gridTestUtils.expectCellValueMatch( 'grid1', 1, 0, 'Bruce Strong' );
+      });
+
+      it('reverse sort by name by clicking header', function () {
+        gridTestUtils.clickHeaderCell( 'grid1', 0 );
+        gridTestUtils.clickHeaderCell( 'grid1', 0 );
+        gridTestUtils.expectCellValueMatch( 'grid1', 0, 0, 'Wilder Gonzales' );
+        gridTestUtils.expectCellValueMatch( 'grid1', 1, 0, 'Valarie Atkinson' );
+      });
+      
+      it('return to original sort by name by clicking header', function () {
+        gridTestUtils.clickHeaderCell( 'grid1', 0 );
+        gridTestUtils.clickHeaderCell( 'grid1', 0 );
+        gridTestUtils.clickHeaderCell( 'grid1', 0 );
+        gridTestUtils.expectCellValueMatch( 'grid1', 0, 0, 'Ethel Price' );
+        gridTestUtils.expectCellValueMatch( 'grid1', 1, 0, 'Claudine Neal' );
+      });
+      
+      it('sort ignored on second column', function() {
+        gridTestUtils.clickHeaderCell( 'grid1', 1 );
+        gridTestUtils.expectCellValueMatch( 'grid1', 0, 0, 'Ethel Price' );
+        gridTestUtils.expectCellValueMatch( 'grid1', 1, 0, 'Claudine Neal' );
+      });
+
+      it('sort disabled on last column', function() {
+        gridTestUtils.clickHeaderCell( 'grid1', 2 );
+        gridTestUtils.expectCellValueMatch( 'grid1', 0, 0, 'Ethel Price' );
+        gridTestUtils.expectCellValueMatch( 'grid1', 1, 0, 'Claudine Neal' );
+      });
+    });
+  </file> 
 </example>

test/e2e/gridTestUtils.spec.js

@@ -315,7 +315,7 @@ module.exports = {
       var resizer = headerCell.all( by.css( '.ui-grid-column-resizer' )).first();
       var menuButton = headerCell.element( by.css( '.ui-grid-column-menu-button' ));
 
-      browser().actions()
+      browser.actions()
         .mouseDown(resizer)
         .mouseMove(menuButton)
         .mouseUp()
@@ -344,7 +344,7 @@ module.exports = {
     shiftClickHeaderCell: function( gridId, colNumber ) {
       var headerCell = this.headerCell( gridId, colNumber);
 
-      browser().actions()
+      browser.actions()
         .keyDown(protractor.Key.SHIFT)
         .click(headerCell)
         .keyUp(protractor.Key.SHIFT)