fix($q): Promises should be Promises/A+ spec compliant

Gruntfile.js

@@ -85,6 +85,7 @@ module.exports = function(grunt) {
       jquery: 'karma-jquery.conf.js',
       docs: 'karma-docs.conf.js',
       modules: 'karma-modules.conf.js',
+      promises: 'karma-promisea.conf.js',
       //NOTE run grunt test:e2e instead and it will start a webserver for you
       end2end: 'karma-e2e.conf.js'
     },
@@ -93,6 +94,7 @@ module.exports = function(grunt) {
     autotest: {
       jqlite: 'karma-jqlite.conf.js',
       jquery: 'karma-jquery.conf.js',
+      promises: 'karma-promisea.conf.js',
       modules: 'karma-modules.conf.js',
       docs: 'karma-docs.conf.js'
     },
@@ -233,9 +235,10 @@ module.exports = function(grunt) {
   grunt.registerTask('test', 'Run unit, docs and e2e tests with Karma', ['package','test:unit', 'tests:docs', 'test:e2e']);
   grunt.registerTask('test:jqlite', 'Run the unit tests with Karma' , ['tests:jqlite']);
   grunt.registerTask('test:jquery', 'Run the jQuery unit tests with Karma', ['tests:jquery']);
+  grunt.registerTask('test:promises','Run the Promises/A+ Test Suite against $q',['tests:promises']);
   grunt.registerTask('test:modules', 'Run the Karma module tests with Karma', ['tests:modules']);
   grunt.registerTask('test:docs', 'Run the doc-page tests with Karma', ['package', 'tests:docs']);
-  grunt.registerTask('test:unit', 'Run unit, jQuery and Karma module tests with Karma', ['tests:jqlite', 'tests:jquery', 'tests:modules']);
+  grunt.registerTask('test:unit', 'Run unit, jQuery and Karma module tests with Karma', ['tests:jqlite', 'tests:jquery','tests:promises', 'tests:modules']);
   grunt.registerTask('test:e2e', 'Run the end to end tests with Karma and keep a test server running in the background', ['connect:testserver', 'tests:end2end']);
   grunt.registerTask('test:docgen', ['jasmine-node']);
 

angularFiles.js

@@ -128,6 +128,15 @@ angularFiles = {
     'example/personalLog/test/*.js'
   ],
 
+  'promises':[
+      'bower_components/jquery/jquery.js',
+      'test/jquery_remove.js',
+      '@angularSrc',
+      'src/publishExternalApis.js',
+      'promises-aplus-tests.js',
+      'promises-aplus-adapter.js'
+  ],
+
   'karmaExclude': [
     'test/jquery_alias.js',
     'src/angular-bootstrap.js',

karma-promisea.conf.js

@@ -0,0 +1,19 @@
+var angularFiles = require('./angularFiles');
+var sharedConfig = require('./karma-shared.conf');
+
+module.exports = function(config) {
+    sharedConfig(config);
+
+    config.set({
+        frameworks:['mocha'],
+        files: angularFiles.mergeFilesFor('promises'),
+        exclude: angularFiles.mergeFilesFor('karmaExclude'),
+
+        junitReporter: {
+            outputFile: 'test_out/promises.xml',
+            suite: 'promises'
+        }
+    });
+
+    config.sauceLabs.testName = 'AngularJS: promises';
+};

package.json

@@ -29,7 +29,8 @@
     "grunt-contrib-jasmine-node": "~0.1.1",
     "grunt-parallel": "~0.2.0",
     "grunt-ddescribe-iit": "~0.0.1",
-    "grunt-merge-conflict": "~0.0.1"
+    "grunt-merge-conflict": "~0.0.1",
+    "karma-mocha": "~0.1.0"
   },
   "licenses": [
     {

promises-aplus-adapter.js

@@ -0,0 +1,30 @@
+describe('Promises/A+ Tests',function(){
+
+    var $q = qFactory(setTimeout, noop);
+    var adapter = {
+        rejected: function(reason){
+            var deferred = $q.defer();
+
+                deferred.reject(reason);
+            return deferred.promise;
+        },
+        fulfilled: function(value){
+            var deferred = $q.defer();
+                deferred.resolve(value);
+            return deferred.promise;
+        },
+        pending : function(){
+            var deferred = $q.defer();
+
+            return {
+                promise: deferred.promise,
+                fulfill: deferred.resolve,
+                reject: deferred.reject
+            };
+        }
+    };
+
+
+    PromisesAplusTests.mocha(adapter);
+
+});