Merge branch 'master' of github.com:unosquare/tubular

src/js/tubular/tubular.spec.js

@@ -1,19 +1,8 @@
 'use strict';
 
 describe('Module: tubular', () => {
-  beforeEach(() => {
-    module('tubular.models');
-    module('tubular.services');
-    module('tubular.directives');
-    module('tubular');
-  });
-
-  it('should load successfully', () => {});
 
-  xit('should have version', () => {
-    // How?
-    inject(tubular => {
-      expect(tubular.info().version).toBeDefined();
-    });
+  it('should have version', () => {
+      expect(angular.module('tubular').info().version).toBeDefined();
   });
 });

test/e2e/grid/tbPageSizeSelector.case.html

@@ -1,3 +1,29 @@
 <tb-grid server-url="{{serverUrl}}" require-authentication="false" page-size="10">
+     <tb-grid-table>
+        <tb-column-definitions>
+            <tb-column name="ID">
+                <tb-column-header>
+                    <span>{{label}}</span>
+                </tb-column-header>
+            </tb-column>
+            <tb-column name="Name">
+                <tb-column-header>
+                    <span>{{label}}</span>
+                </tb-column-header>
+            </tb-column>
+        </tb-column-definitions>
+
+        <tb-row-set>
+            <tb-row-template ng-repeat="row in $component.rows" row-model="row">
+                <tb-cell-template column-name="ID">
+                    {{row.ID}}
+                </tb-cell-template>
+                <tb-cell-template column-name="Name">
+                    {{row.Name}}
+                </tb-cell-template>
+            </tb-row-template>
+        </tb-row-set>
+    </tb-grid-table>
+
     <tb-page-size-selector></tb-page-size-selector>
 </tb-grid>

test/e2e/grid/tbPageSizeSelector.spec.js

@@ -49,23 +49,59 @@ describe('Component: Grid.Pager', () => {
     expect($j(option[3]).text().trim()).toBe('100');
   });
 
-  it('should have selected 20 records', () => {  
+  it('should have selected 20 records', () => {
+    var payload = [];
+    for (var index = 1; index <= 20; index++) {
+      payload.push([index, 'Name' + index]);
+
+    }  
+     $httpBackend.expectPOST(serverUrl)
+      .respond(200, {"Counter": 0, "Payload": payload, "TotalRecordCount": 100, "FilteredRecordCount": 100, "TotalPages": 5, "CurrentPage": 1, "AggregationPayload": {}});
+
+    generate(true);
+
+    var dataRows = element.find('tr');
     $j(select).val('number:20');
 
+    expect($j(dataRows).length).toBe(21);
     expect($j(option[0]).is(':selected')).toBeFalsy();
     expect($j(option[1]).is(':selected')).toBeTruthy();
   });
 
-  it('should have selected 50 records', () => {  
+  it('should have selected 50 records', () => { 
+    var payload = [];
+    for (var index = 1; index <= 50; index++) {
+      payload.push([index, 'Name' + index]);
+
+    }  
+     $httpBackend.expectPOST(serverUrl)
+      .respond(200, {"Counter": 0, "Payload": payload, "TotalRecordCount": 100, "FilteredRecordCount": 100, "TotalPages": 2, "CurrentPage": 1, "AggregationPayload": {}});
+
+    generate(true);
+
+    var dataRows = element.find('tr'); 
     $j(select).val('number:50');
 
+    expect($j(dataRows).length).toBe(51);
     expect($j(option[1]).is(':selected')).toBeFalsy();
     expect($j(option[2]).is(':selected')).toBeTruthy();
   });
 
-  it('should have selected 100 records', () => {  
+  it('should have selected 100 records', () => {
+    var payload = [];
+    for (var index = 1; index <= 100; index++) {
+      payload.push([index, 'Name' + index]);
+
+    }  
+     $httpBackend.expectPOST(serverUrl)
+      .respond(200, {"Counter": 0, "Payload": payload, "TotalRecordCount": 100, "FilteredRecordCount": 100, "TotalPages": 1, "CurrentPage": 1, "AggregationPayload": {}});
+
+    generate(true);
+
+    var dataRows = element.find('tr');   
     $j(select).val('number:100');
 
+    expect($j(dataRows).length).toBe(101);
     expect($j(option[2]).is(':selected')).toBeFalsy();
     expect($j(option[3]).is(':selected')).toBeTruthy();
   });