tests infrastructure refactoring

Author: dhilt

Gruntfile.js

@@ -44,13 +44,13 @@ module.exports = function (grunt) {
     },
     karma: {
       options: {
-        configFile: './test/karma.conf.js',
+        configFile: './test/config/karma.conf.js',
         runnerPort: 9100
       },
       default: {},
       compressed: {
         options: {
-          files: require('./test/karma.conf.files.js').compressedFiles,
+          files: require('./test/config/karma.conf.files.js').compressedFiles,
           port: 9876,
           autoWatch: false,
           keepalive: false,

test/BasicSetupSpec.js

@@ -82,12 +82,12 @@ describe('uiScroll', function() {
   });
 
   describe('basic setup (new datasource get signature)', function() {
-    var scrollSettings = { datasource: 'myNewEmptyDatasource' };
+    var scrollSettings = { datasource: 'myDescriptoEmptyDatasource' };
 
     it('should call get on the datasource 2 times ', function() {
       var spy;
-      inject(function(myNewEmptyDatasource) {
-        spy = spyOn(myNewEmptyDatasource, 'actualGet').and.callThrough();
+      inject(function(myDescriptoEmptyDatasource) {
+        spy = spyOn(myDescriptoEmptyDatasource, 'get').and.callThrough();
       });
       runTest(scrollSettings,
         function() {

test/BasicTestsSpec.js

@@ -43,12 +43,12 @@ describe('uiScroll', function () {
     });
 
     describe('datasource with 3 elements and buffersize 3 (new get signature)', function() {
-        var scrollSettings = { datasource: 'myNewOnePageDatasource', bufferSize: 3 };
+        var scrollSettings = { datasource: 'myDescriptorOnePageDatasource', bufferSize: 3 };
 
         it('should call get on the datasource 3 times ', function () {
             var spy;
-            inject(function (myNewOnePageDatasource) {
-                spy = spyOn(myNewOnePageDatasource, 'actualGet').and.callThrough();
+            inject(function (myDescriptorOnePageDatasource) {
+                spy = spyOn(myDescriptorOnePageDatasource, 'get').and.callThrough();
                 runTest(scrollSettings,
                     function () {
                         expect(spy.calls.all().length).toBe(3);

test/config/karma.conf.files.js

@@ -0,0 +1,25 @@
+var scrollerPath = '../../temp/'
+
+var files = [
+  'http://code.jquery.com/jquery-1.9.1.js',
+  'https://ajax.googleapis.com/ajax/libs/angularjs/1.3.14/angular.js',
+  'https://ajax.googleapis.com/ajax/libs/angularjs/1.3.14/angular-mocks.js',
+  '../misc/test.css',
+  '../misc/datasources.js',
+  '../misc/scaffolding.js',
+  '../*Spec.js',
+  {
+    pattern: scrollerPath + '*.js.map',
+    included: false
+  }
+];
+
+module.exports.defaultFiles = files.concat([
+  scrollerPath + 'ui-scroll.js',
+  scrollerPath + 'ui-scroll-grid.js'
+]);
+
+module.exports.compressedFiles = files.concat([
+  scrollerPath + 'ui-scroll.min.js',
+  scrollerPath + 'ui-scroll-grid.min.js'
+]);