tests(specs): fix tests that break in the ci build

esvit · Aug 16, 2015 · fb7c22d · fb7c22d
1 parent fc2fa18
commit fb7c22d
Show file tree

Hide file tree

Showing 3 changed files with 14 additions and 33 deletions.
diff --git a/test/filtersSpec.js b/test/filtersSpec.js
@@ -2,16 +2,12 @@ describe('ngTableFilterConfig', function () {
  var ngTableFilterConfig,
  ngTableFilterConfigProvider;
 
- beforeEach(function () {
- // Initialize the service provider
- // by injecting it to a fake module's config block
- var fakeModule = angular.module('test.config', function () {});
- fakeModule.config( function (_ngTableFilterConfigProvider_) {
+ beforeEach(module("ngTable"));
+ beforeEach(function(){
+ module(function(_ngTableFilterConfigProvider_){
  ngTableFilterConfigProvider = _ngTableFilterConfigProvider_;
  ngTableFilterConfigProvider.resetConfigs();
  });
- // Initialize test.app injector
- module('ngTable', 'test.config');
  });
 
  beforeEach(inject(function (_ngTableFilterConfig_) {

diff --git a/test/ngTableDefaultGetDataSpec.js b/test/ngTableDefaultGetDataSpec.js
@@ -3,18 +3,13 @@ describe('ngTableDefaultGetData', function () {
  describe('provider', function () {
  var ngTableDefaultGetDataProvider;
 
- beforeEach(function () {
- // grab a reference to the service provider
- // by injecting it to a fake module's config block
- var fakeModule = angular.module('test.config', function () {});
- fakeModule.config(function (_ngTableDefaultGetDataProvider_) {
- ngTableDefaultGetDataProvider = _ngTableDefaultGetDataProvider_;
+ beforeEach(module("ngTable"));
+ beforeEach(function(){
+ module(function(_ngTableDefaultGetDataProvider_){
+ ngTableDefaultGetDataProvider=_ngTableDefaultGetDataProvider_;
  });
- // Initialize test.app injector
- module('ngTable', 'test.config');
- // ensure the config block runs
- inject(function(_ngTableDefaultGetData_){ });
  });
+ beforeEach(inject());
 
  it('should be configured to use built-in angular filters', function () {
  expect(ngTableDefaultGetDataProvider.filterFilterName).toBe('filter');
@@ -246,13 +241,10 @@ describe('ngTableDefaultGetData', function () {
  var ngTableDefaultGetData, tableParams;
 
  beforeEach(function () {
- // grab a reference to the service provider
- // by injecting it to a fake module's config block
- var fakeModule = angular.module('custom.filters', function () {
+ // add a custom filter available to our tests
+ module('ngTable', function($provide){
+  $provide.factory('myCustomFilterFilter', myCustomFilter)
  });
- fakeModule.filter('myCustomFilter', myCustomFilter);
- // Initialize test.app injector
- module('ngTable', 'custom.filters');
 
  myCustomFilter.$inject = [];
  function myCustomFilter() {

diff --git a/test/tableParamsSpec.js b/test/tableParamsSpec.js
@@ -21,12 +21,9 @@ describe('NgTableParams', function () {
  var NgTableParams,
  $rootScope;
 
-
- beforeEach(function () {
- // Initialize the service provider
- // by injecting it to a fake module's config block
- var fakeModule = angular.module('test.config', function () {});
- fakeModule.config( function ($provide) {
+ beforeEach(module("ngTable"));
+ beforeEach(function(){
+ module(function($provide){
  $provide.decorator('ngTableDefaultGetData', createSpy);
 
 
@@ -35,12 +32,8 @@ describe('NgTableParams', function () {
  return jasmine.createSpy('ngTableDefaultGetDataSpy',ngTableDefaultGetData).and.callThrough();
  }
  });
- // Initialize test.app injector
- module('ngTable', 'test.config');
-
  });
 
-
  beforeEach(inject(function ($controller, _$rootScope_, _NgTableParams_) {
  $rootScope = _$rootScope_;
  scope = $rootScope.$new();