From 9f4409c64e48abf125863bca8fd7d390d3421e84 Mon Sep 17 00:00:00 2001
From: Israel-94 <arnulfo_israel@hotmail.com>
Date: Mon, 5 Jun 2017 12:59:28 -0500
Subject: [PATCH 1/2] Changes to tbPageSizeSelector spec

---
 test/e2e/grid/tbPageSizeSelector.case.html | 26 ++++++++++++++
 test/e2e/grid/tbPageSizeSelector.spec.js   | 42 ++++++++++++++++++++--
 2 files changed, 65 insertions(+), 3 deletions(-)

diff --git a/test/e2e/grid/tbPageSizeSelector.case.html b/test/e2e/grid/tbPageSizeSelector.case.html
index bc4ed9c34..37c21bfd6 100644
--- a/test/e2e/grid/tbPageSizeSelector.case.html
+++ b/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>
\ No newline at end of file
diff --git a/test/e2e/grid/tbPageSizeSelector.spec.js b/test/e2e/grid/tbPageSizeSelector.spec.js
index 2e7124ac9..44219200e 100644
--- a/test/e2e/grid/tbPageSizeSelector.spec.js
+++ b/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();
   });

From e16835980fa43ca766b0f5600345c7cce793ac0a Mon Sep 17 00:00:00 2001
From: "alexey.turlapov" <alexey.turlapov@unosquare.com>
Date: Mon, 5 Jun 2017 14:52:55 -0500
Subject: [PATCH 2/2] fixing tubular module spec

---
 src/js/tubular/tubular.spec.js | 15 ++-------------
 1 file changed, 2 insertions(+), 13 deletions(-)

diff --git a/src/js/tubular/tubular.spec.js b/src/js/tubular/tubular.spec.js
index 4bf50d251..3de8db0e4 100644
--- a/src/js/tubular/tubular.spec.js
+++ b/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();
   });
 });