Correct some spec

l-lin · l-lin · commit 29af7f92fadf · 2014-10-18T14:42:59.000+02:00
diff --git a/src/angular-datatables.renderer.js b/src/angular-datatables.renderer.js
@@ -76,8 +76,8 @@ angular.module('datatables.renderer', ['datatables.factory', 'datatables.options
             renderer.render = function ($scope, $elem, staticHTML) {
                 var _this = this,
                     expression = $elem.find('tbody').html(),
-                // Find the resources from the comment <!-- ngRepeat: item in items --> displayed by angular in the DOM
-                // This regexp is inspired by the one used in the "ngRepeat" directive
+                    // Find the resources from the comment <!-- ngRepeat: item in items --> displayed by angular in the DOM
+                    // This regexp is inspired by the one used in the "ngRepeat" directive
                     match = expression.match(/^\s*.+?\s+in\s+(\S*)\s*/),
                     ngRepeatAttr = match[1];
 
diff --git a/test/karma.conf.js b/test/karma.conf.js
@@ -15,14 +15,7 @@ module.exports = function(config) {
             'vendor/datatables/media/js/jquery.dataTables.js',
             'vendor/angular/angular.js',
             'vendor/angular-mocks/angular-mocks.js',
-            'src/angular-datatables.bootstrap.options.js',
-            'src/angular-datatables.bootstrap.js',
-            'src/angular-datatables.renderer.js',
-            'src/angular-datatables.factory.js',
-            'src/angular-datatables.util.js',
-            'src/angular-datatables.directive.js',
-            'src/angular-datatables.options.js',
-            'src/angular-datatables.js',
+            'src/*.js',
             'test/spec/*.spec.js'
         ],
 
diff --git a/test/spec/angular-datatables.renderer.spec.js b/test/spec/angular-datatables.renderer.spec.js
@@ -76,11 +76,9 @@ describe('datatables.renderer', function () {
                     });
             });
             it('should set the "destroy" option to true if we render again', inject(function ($timeout) {
-                // add $timeout in order to "wait" the DataTables to be renderer before calling the following codes
-                $timeout(function () {
-                    DTRendererService.renderDataTableAndEmitEvent($elem, options, $scope);
-                    expect(options.destroy).toBeTruthy();
-                }, 0, false);
+                spyOn($.fn.dataTable, 'isDataTable').andReturn(true);
+                DTRendererService.renderDataTableAndEmitEvent($elem, options, $scope);
+                expect(options.destroy).toBeTruthy();
             }));
         });
         describe(', when rendering the DataTable,', function () {
@@ -189,12 +187,12 @@ describe('datatables.renderer', function () {
         }));
 
         it('should render the DataTable', function () {
-            $timeout(function () {
-                renderer = DTDefaultRenderer.create();
-                var oTable = renderer.render($scope, $elem);
-                expect(DTRendererService.doRenderDataTable).toHaveBeenCalledWith($elem, options, $scope);
-                expect(oTable).toBeDefined();
-            }, 0, false);
+            renderer = DTDefaultRenderer.create();
+            renderer = renderer.render($scope, $elem);
+            $timeout.flush();
+            expect(DTRendererService.doRenderDataTable).toHaveBeenCalled();
+            expect(renderer).toBeDefined();
+            expect(renderer.name).toBe('DTDefaultRenderer');
         });
     });
 });
