Bumped dependencies, updated promise test to better work across angul…

…ar versions and added Firefox runner.
oblador · Feb 20, 2015 · a492cae · a492cae
1 parent 88d3fce
commit a492cae
Show file tree

Hide file tree

Showing 7 changed files with 31 additions and 24 deletions.
diff --git a/.travis.yml b/.travis.yml
@@ -3,7 +3,7 @@ language: node_js
 sudo: false
 
 node_js:
-  - "0.11"
+  - "0.12"
 
 before_install:
   - npm install -g bower
@@ -12,4 +12,4 @@ before_install:
   - export DISPLAY=:99.0
   - sh -e /etc/init.d/xvfb start
 
-script: npm run build
+script: npm run test-ci
diff --git a/bower.json b/bower.json
@@ -17,5 +17,8 @@
   },
   "devDependencies": {
     "angular-mocks": "^1.2.16"
+  },
+  "resolutions": {
+    "angular": "^1.2.16"
   }
 }
diff --git a/gulpfile.js b/gulpfile.js
@@ -35,7 +35,7 @@ gulp.task('lint', function() {
     .pipe(jshint.reporter('default'));
 });
 
-gulp.task('test', function(done) {
+gulp.task('karma', function(done) {
   karma.start({configFile: __dirname + '/test/karma.conf.js', singleRun: true}, done);
 });
 
@@ -56,4 +56,6 @@ gulp.task('compress', function() {
     .pipe(gulp.dest('./'));
 });
 
-gulp.task('default', ['lint', 'test', 'clean', 'compress']);
+gulp.task('build', ['clean', 'compress']);
+gulp.task('test', ['lint', 'karma']);
+gulp.task('default', ['test', 'build']);
diff --git a/package.json b/package.json
@@ -20,27 +20,28 @@
   "scripts": {
     "start": "http-server -p 8888",
     "test": "./node_modules/karma/bin/karma start test/karma.conf.js",
-    "build": "./node_modules/.bin/gulp",
-    "test-single-run": "./node_modules/karma/bin/karma start test/karma.conf.js  --single-run",
+    "build": "./node_modules/.bin/gulp build",
+    "test-ci": "./node_modules/.bin/gulp test",
+    "test-single-run": "./node_modules/karma/bin/karma start test/karma.conf.js --single-run",
     "update-webdriver": "node_modules/protractor/bin/webdriver-manager update",
-    "protractor": "node_modules/protractor/bin/protractor test/protractor-conf.js"
+    "protractor": "node_modules/protractor/bin/protractor test/protractor.conf.js"
   },
   "author": "Joel Arvidsson",
   "license": "MIT",
   "devDependencies": {
-    "gulp": "~3.8.0",
-    "gulp-concat": "~2.3.4",
-    "gulp-jshint": "~1.8.4",
-    "gulp-ng-annotate": "~0.3.0",
-    "gulp-rimraf": "~0.1.0",
-    "gulp-sourcemaps": "^1.1.1",
-    "gulp-uglify": "~0.3.1",
-    "http-server": "^0.6.1",
-    "jasmine-given": "~2.6.2",
-    "karma": "~0.12.21",
-    "karma-chrome-launcher": "~0.1.3",
-    "karma-firefox-launcher": "~0.1.3",
-    "karma-jasmine": "~0.2.0",
-    "protractor": "~1.0.0"
+    "gulp": "^3.8.11",
+    "gulp-concat": "^2.5.1",
+    "gulp-jshint": "^1.9.2",
+    "gulp-ng-annotate": "^0.5.2",
+    "gulp-rimraf": "^0.1.1",
+    "gulp-sourcemaps": "^1.3.0",
+    "gulp-uglify": "^1.1.0",
+    "http-server": "^0.7.4",
+    "jasmine-given": "^2.6.2",
+    "karma": "^0.12.31",
+    "karma-chrome-launcher": "^0.1.7",
+    "karma-firefox-launcher": "^0.1.4",
+    "karma-jasmine": "^0.3.5",
+    "protractor": "^1.7.0"
   }
 }
diff --git a/test/karma.conf.js b/test/karma.conf.js
@@ -13,7 +13,7 @@ module.exports = function(config){
     files : testFiles,
     autoWatch : true,
     frameworks: ['jasmine'],
-    browsers : ['Chrome'],
+    browsers : ['Firefox', 'Chrome'],
     customLaunchers: {
       Chrome_travis_ci: {
         base: 'Chrome',

diff --git a/test/protractor-conf.js → test/protractor.conf.js b/test/protractor-conf.js → test/protractor.conf.js
diff --git a/test/unit/helpersSpec.js b/test/unit/helpersSpec.js
@@ -6,10 +6,11 @@ describe('jqlite helpers', function() {
   describe('scrollTopAnimated', function() {
     var duration = 100;
 
-    it('should return a promise', inject(function($document, $rootScope) {
+    it('should return a promise', inject(function($document, $q, $rootScope) {
+      var deferred = $q.defer();
       var promise = $document.scrollTopAnimated(100, duration);
       expect(promise).toEqual(jasmine.any(Object));
-      expect(Object.keys(promise)).toEqual(['then', 'catch', 'finally']);
+      expect(Object.keys(promise)).toEqual(Object.keys(deferred.promise));
 
       it('which should resolve when done animating', function(done){
         spyOn(promise, 'then');