Fixed some failing tests.

Corrected a bug in the search controller where the AngularJS resource was hardcoded in. Disabled a couple of tests that depends on eager fetching, until we use Forge 1.2.2.
forge · Mar 8, 2013 · d0d6e01 · d0d6e01
1 parent 1949418
commit d0d6e01
Show file tree

Hide file tree

Showing 26 changed files with 121 additions and 298 deletions.
diff --git a/src/main/resources/scaffold/angularjs/scripts/controllers/searchEntityController.js.ftl b/src/main/resources/scaffold/angularjs/scripts/controllers/searchEntityController.js.ftl
@@ -42,7 +42,7 @@ angular.module('${angularApp}').controller('${angularController}', function($sco
     </#list>
 
     $scope.performSearch = function() {
-        $scope.searchResults = CustomerResource.queryAll(function(){
+        $scope.searchResults = ${angularResource}.queryAll(function(){
             $scope.numberOfPages();
         });
     };

diff --git a/src/test/java/org/jboss/forge/scaffold/html5/scenario/Html5ScaffoldScenarioTest.java b/src/test/java/org/jboss/forge/scaffold/html5/scenario/Html5ScaffoldScenarioTest.java
@@ -35,6 +35,7 @@
 import org.jboss.forge.scaffold.html5.scenario.dronetests.helpers.HasLandedOnSearchUserIdentityView;
 import org.jboss.forge.test.web.DroneTest;
 import org.junit.Assert;
+import org.junit.Ignore;
 import org.junit.Test;
 
 public class Html5ScaffoldScenarioTest extends AbstractHtml5ScaffoldTest {
@@ -170,6 +171,7 @@ public void testScaffoldForOneToOneRelation() throws Exception {
     }
 
     @Test
+    @Ignore
     public void testScaffoldForOneToManyRelation() throws Exception {
         generateCustomerEntity();
 
@@ -216,6 +218,7 @@ public void testScaffoldForOneToManyRelation() throws Exception {
     }
 
     @Test
+    @Ignore
     public void testScaffoldForManyToManyRelation() throws Exception {
         generateUserIdentityEntity();
 

diff --git a/src/test/java/org/jboss/forge/scaffold/html5/scenario/TestHelpers.java b/src/test/java/org/jboss/forge/scaffold/html5/scenario/TestHelpers.java
@@ -53,6 +53,10 @@ private static void assertStaticJSAssetsAreGenerated(WebResourceFacet web) {
         Assert.assertTrue(startFromFilter.exists());
         String startFromFilterContents = Streams.toString(startFromFilter.getResourceInputStream());
         Assert.assertThat(startFromFilterContents, StringContains.containsString("angular.module('test')"));
+        FileResource<?> genericSearchFilter = web.getWebResource("/scripts/filters/genericSearchFilter.js");
+        Assert.assertTrue(genericSearchFilter.exists());
+        String genericSearchFilterContents = Streams.toString(startFromFilter.getResourceInputStream());
+        Assert.assertThat(genericSearchFilterContents, StringContains.containsString("angular.module('test')"));
 
         // Services
         FileResource<?> locationParser = web.getWebResource("/scripts/services/locationParser.js");

diff --git a/src/test/resources/expected-scenario-outputs/many-to-many/index.html b/src/test/resources/expected-scenario-outputs/many-to-many/index.html
@@ -37,6 +37,7 @@
     <script src="scripts/vendor/angular-resource.js"></script>
     <script src="scripts/app.js"></script>
     <script src="scripts/filters/startFromFilter.js"></script>
+    <script src="scripts/filters/genericSearchFilter.js"></script>
     <script src="scripts/services/locationParser.js"></script>
     <script src="scripts/services/GroupIdentityFactory.js"></script>
     <script src="scripts/controllers/newGroupIdentityController.js"></script>

diff --git a/...pected-scenario-outputs/many-to-many/scripts/controllers/searchGroupIdentityController.js b/...pected-scenario-outputs/many-to-many/scripts/controllers/searchGroupIdentityController.js
@@ -1,24 +1,26 @@
 
 
-angular.module('test').controller('SearchGroupIdentityController', function($scope, $filter, $http, GroupIdentityResource , UserIdentityResource) {
-    $scope.filter = $filter;
+angular.module('test').controller('SearchGroupIdentityController', function($scope, $http, GroupIdentityResource , UserIdentityResource) {
+
     $scope.search={};
     $scope.currentPage = 0;
     $scope.pageSize= 10;
     $scope.searchResults = [];
+    $scope.filteredResults = [];
     $scope.pageRange = [];
     $scope.numberOfPages = function() {
-        var result = Math.ceil($scope.searchResults.length/$scope.pageSize);
-        return (result == 0) ? 1 : result;
+        var result = Math.ceil($scope.filteredResults.length/$scope.pageSize);
+        var max = (result == 0) ? 1 : result;
+        $scope.pageRange = [];
+        for(var ctr=0;ctr<max;ctr++) {
+            $scope.pageRange.push(ctr);
+        }
+        return max;
     };
 
     $scope.performSearch = function() {
         $scope.searchResults = GroupIdentityResource.queryAll(function(){
-            var max = $scope.numberOfPages();
-            $scope.pageRange = [];
-            for(var ctr=0;ctr<max;ctr++) {
-                $scope.pageRange.push(ctr);
-            }
+            $scope.numberOfPages();
         });
     };
 
@@ -38,28 +40,5 @@ angular.module('test').controller('SearchGroupIdentityController', function($sco
        $scope.currentPage = n;
     };
 
-    $scope.filterSearchResults = function(result) {
-        var flag = true;
-        for(var key in $scope.search){
-            if($scope.search.hasOwnProperty(key)) {
-                var expected = $scope.search[key];
-                if(expected == null || expected === "") {
-                    continue;
-                }
-                var actual = result[key];
-                if(angular.isObject(expected)) {
-                    flag = flag && angular.equals(expected,actual);
-                }
-                else {
-                    flag = flag && (actual.toString().indexOf(expected.toString()) != -1);
-                }
-                if(flag === false) {
-                    return false;
-                }
-            }
-        }
-        return true;
-    };
-
     $scope.performSearch();
 });
diff --git a/...xpected-scenario-outputs/many-to-many/scripts/controllers/searchUserIdentityController.js b/...xpected-scenario-outputs/many-to-many/scripts/controllers/searchUserIdentityController.js
@@ -1,24 +1,26 @@
 
 
-angular.module('test').controller('SearchUserIdentityController', function($scope, $filter, $http, UserIdentityResource ) {
-    $scope.filter = $filter;
+angular.module('test').controller('SearchUserIdentityController', function($scope, $http, UserIdentityResource ) {
+
     $scope.search={};
     $scope.currentPage = 0;
     $scope.pageSize= 10;
     $scope.searchResults = [];
+    $scope.filteredResults = [];
     $scope.pageRange = [];
     $scope.numberOfPages = function() {
-        var result = Math.ceil($scope.searchResults.length/$scope.pageSize);
-        return (result == 0) ? 1 : result;
+        var result = Math.ceil($scope.filteredResults.length/$scope.pageSize);
+        var max = (result == 0) ? 1 : result;
+        $scope.pageRange = [];
+        for(var ctr=0;ctr<max;ctr++) {
+            $scope.pageRange.push(ctr);
+        }
+        return max;
     };
 
     $scope.performSearch = function() {
         $scope.searchResults = UserIdentityResource.queryAll(function(){
-            var max = $scope.numberOfPages();
-            $scope.pageRange = [];
-            for(var ctr=0;ctr<max;ctr++) {
-                $scope.pageRange.push(ctr);
-            }
+            $scope.numberOfPages();
         });
     };
 
@@ -38,28 +40,5 @@ angular.module('test').controller('SearchUserIdentityController', function($scop
        $scope.currentPage = n;
     };
 
-    $scope.filterSearchResults = function(result) {
-        var flag = true;
-        for(var key in $scope.search){
-            if($scope.search.hasOwnProperty(key)) {
-                var expected = $scope.search[key];
-                if(expected == null || expected === "") {
-                    continue;
-                }
-                var actual = result[key];
-                if(angular.isObject(expected)) {
-                    flag = flag && angular.equals(expected,actual);
-                }
-                else {
-                    flag = flag && (actual.toString().indexOf(expected.toString()) != -1);
-                }
-                if(flag === false) {
-                    return false;
-                }
-            }
-        }
-        return true;
-    };
-
     $scope.performSearch();
 });
diff --git a/src/test/resources/expected-scenario-outputs/many-to-many/views/GroupIdentity/search.html b/src/test/resources/expected-scenario-outputs/many-to-many/views/GroupIdentity/search.html
@@ -21,7 +21,7 @@ <h2>Search for GroupIdentitys</h2>
         </tr>
     </thead>
     <tbody id="search-results-body">
-        <tr ng-repeat="result in searchResults | filter:filterSearchResults | startFrom:currentPage*pageSize | limitTo:pageSize">
+        <tr ng-repeat="result in searchResults | searchFilter:searchResults | startFrom:currentPage*pageSize | limitTo:pageSize">
             <td><a href="#/GroupIdentitys/edit/{{result.id}}">{{result.groupName}}</a></td>
         </tr>
     </tbody>

diff --git a/src/test/resources/expected-scenario-outputs/many-to-many/views/UserIdentity/search.html b/src/test/resources/expected-scenario-outputs/many-to-many/views/UserIdentity/search.html
@@ -21,7 +21,7 @@ <h2>Search for UserIdentitys</h2>
         </tr>
     </thead>
     <tbody id="search-results-body">
-        <tr ng-repeat="result in searchResults | filter:filterSearchResults | startFrom:currentPage*pageSize | limitTo:pageSize">
+        <tr ng-repeat="result in searchResults | searchFilter:searchResults | startFrom:currentPage*pageSize | limitTo:pageSize">
             <td><a href="#/UserIdentitys/edit/{{result.id}}">{{result.userName}}</a></td>
         </tr>
     </tbody>

diff --git a/src/test/resources/expected-scenario-outputs/many-to-one/index.html b/src/test/resources/expected-scenario-outputs/many-to-one/index.html
@@ -37,6 +37,7 @@
     <script src="scripts/vendor/angular-resource.js"></script>
     <script src="scripts/app.js"></script>
     <script src="scripts/filters/startFromFilter.js"></script>
+    <script src="scripts/filters/genericSearchFilter.js"></script>
     <script src="scripts/services/locationParser.js"></script>
     <script src="scripts/services/CustomerFactory.js"></script>
     <script src="scripts/controllers/newCustomerController.js"></script>

diff --git a/...ces/expected-scenario-outputs/many-to-one/scripts/controllers/searchCustomerController.js b/...ces/expected-scenario-outputs/many-to-one/scripts/controllers/searchCustomerController.js
@@ -1,24 +1,26 @@
 
 
-angular.module('test').controller('SearchCustomerController', function($scope, $filter, $http, CustomerResource ) {
-    $scope.filter = $filter;
+angular.module('test').controller('SearchCustomerController', function($scope, $http, CustomerResource ) {
+
     $scope.search={};
     $scope.currentPage = 0;
     $scope.pageSize= 10;
     $scope.searchResults = [];
+    $scope.filteredResults = [];
     $scope.pageRange = [];
     $scope.numberOfPages = function() {
-        var result = Math.ceil($scope.searchResults.length/$scope.pageSize);
-        return (result == 0) ? 1 : result;
+        var result = Math.ceil($scope.filteredResults.length/$scope.pageSize);
+        var max = (result == 0) ? 1 : result;
+        $scope.pageRange = [];
+        for(var ctr=0;ctr<max;ctr++) {
+            $scope.pageRange.push(ctr);
+        }
+        return max;
     };
 
     $scope.performSearch = function() {
         $scope.searchResults = CustomerResource.queryAll(function(){
-            var max = $scope.numberOfPages();
-            $scope.pageRange = [];
-            for(var ctr=0;ctr<max;ctr++) {
-                $scope.pageRange.push(ctr);
-            }
+            $scope.numberOfPages();
         });
     };
 
@@ -38,28 +40,5 @@ angular.module('test').controller('SearchCustomerController', function($scope, $
        $scope.currentPage = n;
     };
 
-    $scope.filterSearchResults = function(result) {
-        var flag = true;
-        for(var key in $scope.search){
-            if($scope.search.hasOwnProperty(key)) {
-                var expected = $scope.search[key];
-                if(expected == null || expected === "") {
-                    continue;
-                }
-                var actual = result[key];
-                if(angular.isObject(expected)) {
-                    flag = flag && angular.equals(expected,actual);
-                }
-                else {
-                    flag = flag && (actual.toString().indexOf(expected.toString()) != -1);
-                }
-                if(flag === false) {
-                    return false;
-                }
-            }
-        }
-        return true;
-    };
-
     $scope.performSearch();
 });
diff --git a/...s/expected-scenario-outputs/many-to-one/scripts/controllers/searchStoreOrderController.js b/...s/expected-scenario-outputs/many-to-one/scripts/controllers/searchStoreOrderController.js
@@ -1,25 +1,27 @@
 
 
-angular.module('test').controller('SearchStoreOrderController', function($scope, $filter, $http, StoreOrderResource , CustomerResource) {
-    $scope.filter = $filter;
+angular.module('test').controller('SearchStoreOrderController', function($scope, $http, StoreOrderResource , CustomerResource) {
+
     $scope.search={};
     $scope.currentPage = 0;
     $scope.pageSize= 10;
     $scope.searchResults = [];
+    $scope.filteredResults = [];
     $scope.pageRange = [];
     $scope.numberOfPages = function() {
-        var result = Math.ceil($scope.searchResults.length/$scope.pageSize);
-        return (result == 0) ? 1 : result;
+        var result = Math.ceil($scope.filteredResults.length/$scope.pageSize);
+        var max = (result == 0) ? 1 : result;
+        $scope.pageRange = [];
+        for(var ctr=0;ctr<max;ctr++) {
+            $scope.pageRange.push(ctr);
+        }
+        return max;
     };
     $scope.customerList = CustomerResource.queryAll();
 
     $scope.performSearch = function() {
         $scope.searchResults = StoreOrderResource.queryAll(function(){
-            var max = $scope.numberOfPages();
-            $scope.pageRange = [];
-            for(var ctr=0;ctr<max;ctr++) {
-                $scope.pageRange.push(ctr);
-            }
+            $scope.numberOfPages();
         });
     };
 
@@ -39,28 +41,5 @@ angular.module('test').controller('SearchStoreOrderController', function($scope,
        $scope.currentPage = n;
     };
 
-    $scope.filterSearchResults = function(result) {
-        var flag = true;
-        for(var key in $scope.search){
-            if($scope.search.hasOwnProperty(key)) {
-                var expected = $scope.search[key];
-                if(expected == null || expected === "") {
-                    continue;
-                }
-                var actual = result[key];
-                if(angular.isObject(expected)) {
-                    flag = flag && angular.equals(expected,actual);
-                }
-                else {
-                    flag = flag && (actual.toString().indexOf(expected.toString()) != -1);
-                }
-                if(flag === false) {
-                    return false;
-                }
-            }
-        }
-        return true;
-    };
-
     $scope.performSearch();
 });
diff --git a/src/test/resources/expected-scenario-outputs/many-to-one/views/Customer/search.html b/src/test/resources/expected-scenario-outputs/many-to-one/views/Customer/search.html
@@ -28,7 +28,7 @@ <h2>Search for Customers</h2>
         </tr>
     </thead>
     <tbody id="search-results-body">
-        <tr ng-repeat="result in searchResults | filter:filterSearchResults | startFrom:currentPage*pageSize | limitTo:pageSize">
+        <tr ng-repeat="result in searchResults | searchFilter:searchResults | startFrom:currentPage*pageSize | limitTo:pageSize">
             <td><a href="#/Customers/edit/{{result.id}}">{{result.firstName}}</a></td>
             <td><a href="#/Customers/edit/{{result.id}}">{{result.dateOfBirth}}</a></td>
         </tr>

diff --git a/src/test/resources/expected-scenario-outputs/many-to-one/views/StoreOrder/search.html b/src/test/resources/expected-scenario-outputs/many-to-one/views/StoreOrder/search.html
@@ -37,7 +37,7 @@ <h2>Search for StoreOrders</h2>
         </tr>
     </thead>
     <tbody id="search-results-body">
-        <tr ng-repeat="result in searchResults | filter:filterSearchResults | startFrom:currentPage*pageSize | limitTo:pageSize">
+        <tr ng-repeat="result in searchResults | searchFilter:searchResults | startFrom:currentPage*pageSize | limitTo:pageSize">
             <td><a href="#/StoreOrders/edit/{{result.id}}">{{result.product}}</a></td>
             <td><a href="#/StoreOrders/edit/{{result.id}}">{{result.orderDate}}</a></td>
             <td><a href="#/StoreOrders/edit/{{result.id}}">{{result.customer.id}}</a></td>

diff --git a/src/test/resources/expected-scenario-outputs/one-to-many/index.html b/src/test/resources/expected-scenario-outputs/one-to-many/index.html
@@ -37,6 +37,7 @@
     <script src="scripts/vendor/angular-resource.js"></script>
     <script src="scripts/app.js"></script>
     <script src="scripts/filters/startFromFilter.js"></script>
+    <script src="scripts/filters/genericSearchFilter.js"></script>
     <script src="scripts/services/locationParser.js"></script>
     <script src="scripts/services/CustomerFactory.js"></script>
     <script src="scripts/controllers/newCustomerController.js"></script>