splitted tests scaffolding procedure

Author: dhilt

test/config/karma.conf.files.js

@@ -6,7 +6,7 @@ var files = [
   'https://ajax.googleapis.com/ajax/libs/angularjs/1.3.14/angular-mocks.js',
   '../misc/test.css',
   '../misc/datasources.js',
-  '../misc/scaffolding.js',
+  '../misc/scaffolding*.js',
   '../*Spec.js',
   {
     pattern: scrollerPath + '*.js.map',

test/misc/scaffolding.js

@@ -21,34 +21,6 @@ function createHtml(settings) {
     '</div>';
 }
 
-function createGridHtml (settings) {
-  var viewportStyle = ' style="height:' + (settings.viewportHeight || 200) + 'px"';
-  var columns = ['col0', 'col1', 'col2', 'col3'];
-
-  var html =
-    '<table ui-scroll-viewport ' + viewportStyle + ' >' +
-      '<thead style="display:block">' +
-        '<tr>';
-  columns.forEach(col => { html +=
-          '<th ui-scroll-th class="' + col + '">' + col + '</th>';
-  }); html +=
-        '</tr>' +
-      '</thead>' +
-      '<tbody class="grid">' +
-        '<tr ui-scroll="item in ' + settings.datasource + '" adapter="adapter">';
-        if(settings.rowTemplate) {
-          html += settings.rowTemplate;
-        } else {
-          columns.forEach(col => { html +=
-            '<td ui-scroll-td class="' + col + '">{{item.' + col + '}}</td>';
-          });
-        } html +=
-        '</tr>' +
-      '</tbody>' +
-    '</table>';
-  return html;
-}
-
 function finalize(scroller, options = {}, scope, $timeout) {
   scroller.remove();
 
@@ -91,31 +63,4 @@ function runTest(scrollSettings, run, options = {}) {
       }
     }
   });
-}
-
-function runGridTest(scrollSettings, run, options = {}) {
-  inject(function($rootScope, $compile, $window, $timeout) {
-    var scroller = angular.element(createGridHtml(scrollSettings));
-    var scope = $rootScope.$new();
-
-    angular.element(document).find('body').append(scroller);
-    var head = angular.element(scroller.children()[0]);
-    var body = angular.element(scroller.children()[1]);
-
-    if (options.scope) {
-      angular.extend(scope, options.scope);
-    }
-
-    $compile(scroller)(scope);
-
-    scope.$apply();
-    $timeout.flush();
-
-    try {
-      run(head, body, scope, $timeout);
-    } finally {
-      finalize(scroller, options, scope, $timeout);
-    }
-
-  });
 }

test/misc/scaffoldingGrid.js

@@ -0,0 +1,61 @@
+function createGridHtml (settings) {
+  var viewportStyle = ' style="height:' + (settings.viewportHeight || 200) + 'px"';
+  var columns = ['col0', 'col1', 'col2', 'col3'];
+
+  var html =
+    '<table ui-scroll-viewport ' + viewportStyle + ' >' +
+      '<thead style="display:block">' +
+        '<tr>';
+  columns.forEach(col => { html +=
+          '<th ui-scroll-th class="' + col + '">' + col + '</th>';
+  }); html +=
+        '</tr>' +
+      '</thead>' +
+      '<tbody class="grid">' +
+        '<tr ui-scroll="item in ' + settings.datasource + '" adapter="adapter">';
+        if(settings.rowTemplate) {
+          html += settings.rowTemplate;
+        } else {
+          columns.forEach(col => { html +=
+            '<td ui-scroll-td class="' + col + '">{{item.' + col + '}}</td>';
+          });
+        } html +=
+        '</tr>' +
+      '</tbody>' +
+    '</table>';
+  return html;
+}
+
+function finalize(scroller, options = {}, scope, $timeout) {
+  scroller.remove();
+
+  if (typeof options.cleanupTest === 'function') {
+    options.cleanupTest(scroller, scope, $timeout);
+  }
+}
+
+function runGridTest(scrollSettings, run, options = {}) {
+  inject(function($rootScope, $compile, $window, $timeout) {
+    var scroller = angular.element(createGridHtml(scrollSettings));
+    var scope = $rootScope.$new();
+
+    angular.element(document).find('body').append(scroller);
+    var head = angular.element(scroller.children()[0]);
+    var body = angular.element(scroller.children()[1]);
+
+    if (options.scope) {
+      angular.extend(scope, options.scope);
+    }
+
+    $compile(scroller)(scope);
+
+    scope.$apply();
+    $timeout.flush();
+
+    try {
+      run(head, body, scope, $timeout);
+    } finally {
+      finalize(scroller, options, scope, $timeout);
+    }
+  });
+}