Allow service factory functions to return promises

.gitignore

@@ -12,3 +12,4 @@ angular.js.tmproj
 angular.xcodeproj
 .idea
 .agignore
+libpeerconnection.log

.travis.yml

@@ -12,9 +12,8 @@ before_script:
   - export SAUCE_ACCESS_KEY=`echo $SAUCE_ACCESS_KEY | rev`
   - ./lib/sauce/sauce_connect_setup.sh
   - npm install -g grunt-cli
-  - grunt package
-  - grunt webserver > /dev/null &
+  - grunt ci-checks package
   - ./lib/sauce/sauce_connect_block.sh
 
 script:
-  - grunt test --reporters dots --browsers SL_Chrome
+  - grunt parallel:travis --reporters dots --browsers SL_Chrome

Gruntfile.js

@@ -8,7 +8,10 @@ module.exports = function(grunt) {
   grunt.loadNpmTasks('grunt-contrib-connect');
   grunt.loadNpmTasks('grunt-contrib-compress');
   grunt.loadNpmTasks('grunt-contrib-jasmine-node');
+  grunt.loadNpmTasks('grunt-ddescribe-iit');
+  grunt.loadNpmTasks('grunt-merge-conflict');
   grunt.loadNpmTasks('grunt-shell');
+  grunt.loadNpmTasks('grunt-parallel');
   grunt.loadTasks('lib/grunt');
 
   var NG_VERSION = util.getVersion();
@@ -23,6 +26,21 @@ module.exports = function(grunt) {
   grunt.initConfig({
     NG_VERSION: NG_VERSION,
 
+    parallel: {
+      travis: {
+        options: {
+          stream: true
+        },
+        tasks: [
+          util.parallelTask('test:docs'),
+          util.parallelTask('test:modules'),
+          util.parallelTask('test:jquery'),
+          util.parallelTask('test:jqlite'),
+          util.parallelTask('test:e2e')
+        ]
+      }
+    },
+
     connect: {
       devserver: {
         options: {
@@ -42,7 +60,24 @@ module.exports = function(grunt) {
           }
         }
       },
-      testserver: {}
+      testserver: {
+        options: {
+          middleware: function(connect, options){
+            return [
+              function(req, resp, next) {
+                // cache get requests to speed up tests on travis
+                if (req.method === 'GET') {
+                  resp.setHeader('Cache-control', 'public, max-age=3600');
+                }
+
+                next();
+              },
+              connect.favicon('images/favicon.ico'),
+              connect.static(options.base)
+            ];
+          }
+        }
+      }
     },
 
 
@@ -161,6 +196,22 @@ module.exports = function(grunt) {
       run: { spec: 'docs/spec' }
     },
 
+    "ddescribe-iit": {
+      files: [
+        'test/**/*.js',
+        '!test/ngScenario/DescribeSpec.js'
+      ]
+    },
+
+    "merge-conflict": {
+      files: [
+        'src/**/*',
+        'test/**/*',
+        'docs/**/*',
+        'css/**/*'
+      ]
+    },
+
     copy: {
       i18n: {
         files: [
@@ -191,6 +242,7 @@ module.exports = function(grunt) {
   grunt.registerTask('minify', ['shell:bower','clean', 'build', 'minall']);
   grunt.registerTask('test:e2e', ['connect:testserver', 'test:end2end']);
   grunt.registerTask('webserver', ['connect:devserver']);
-  grunt.registerTask('package', ['shell:bower','clean', 'buildall', 'minall', 'docs', 'copy', 'write', 'compress']);
+  grunt.registerTask('package', ['shell:bower','clean', 'buildall', 'minall', 'collect-errors', 'docs', 'copy', 'write', 'compress']);
+  grunt.registerTask('ci-checks', ['ddescribe-iit', 'merge-conflict']);
   grunt.registerTask('default', ['package']);
 };

angularFiles.js

@@ -30,6 +30,7 @@ angularFiles = {
     'src/ng/httpBackend.js',
     'src/ng/locale.js',
     'src/ng/timeout.js',
+    'src/ng/urlUtils.js',
 
     'src/ng/filter.js',
     'src/ng/filter/filter.js',

bower.json

@@ -6,6 +6,7 @@
     "google-code-prettify": "1.0.0",
     "components-font-awesome": "3.1.0",
     "bootstrap": "https://raw.github.com/twitter/bootstrap/v2.0.2/docs/assets/bootstrap.zip",
-    "closure-compiler": "https://closure-compiler.googlecode.com/files/compiler-20130603.zip"
+    "closure-compiler": "https://closure-compiler.googlecode.com/files/compiler-20130603.zip",
+    "ng-closure-runner": "https://raw.github.com/angular/ng-closure-runner/v0.1.1/assets/ng-closure-runner.zip"
   }
 }

css/angular.css

@@ -2,7 +2,7 @@
 
 [ng\:cloak], [ng-cloak], [data-ng-cloak], [x-ng-cloak],
 .ng-cloak, .x-ng-cloak {
-  display: none;
+  display: none !important;
 }
 
 ng\:form {

docs/component-spec/annotationsSpec.js

@@ -91,13 +91,21 @@ describe('Docs Annotations', function() {
           }
         });
       });
-      inject(function($rootScope, $compile, $templateCache) {
+      inject(function($rootScope, $compile, $templateCache, $rootElement, $animator) {
+        $animator.enabled(true);
         url = '/page.html';
         $scope = $rootScope.$new();
         parent = angular.element('<div class="parent"></div>');
         element = angular.element('<div data-url="' + url + '" foldout></div>');
-        body.append(parent);
+
+        //we're injecting the element to the $rootElement since the changes in
+        //$animator only detect and perform animations if the root element has
+        //animations enabled. If the element is not apart of the DOM
+        //then animations are skipped.
         parent.append(element);
+        $rootElement.append(parent);
+        body.append($rootElement);
+
         $compile(parent)($scope);
         $scope.$apply();
       });

docs/content/guide/dev_guide.e2e-testing.ngdoc

@@ -136,7 +136,7 @@ the given jQuery `selector`. The `label` is used for test output.
 ## select(name).option(value)
 Picks the option with the given `value` on the select with the given `name`.
 
-## select(name).option(value1, value2...)
+## select(name).options(value1, value2...)
 Picks the options with the given `values` on the multi select with the given `name`.
 
 ## element(selector, label).count()

docs/content/guide/dev_guide.services.$location.ngdoc

@@ -212,7 +212,7 @@ In this mode, `$location` uses Hashbang URLs in all browsers.
 it('should show example', inject(
   function($locationProvider) {
     $locationProvider.html5Mode(false);
-    $locationProvider.hashPrefix = '!';
+    $locationProvider.hashPrefix('!');
   },
   function($location) {
     // open http://host.com/base/index.html#!/a
@@ -261,7 +261,7 @@ having to worry about whether the browser displaying your app supports the histo
 it('should show example', inject(
   function($locationProvider) {
     $locationProvider.html5Mode(true);
-    $locationProvider.hashPrefix = '!';
+    $locationProvider.hashPrefix('!');
   },
   function($location) {
     // in browser with HTML5 history support:

docs/content/guide/dev_guide.services.injecting_controllers.ngdoc

@@ -57,6 +57,7 @@ myController.$inject = ['$scope','notify'];
   <p>Let's try this simple notify service, injected into the controller...</p>
   <input ng-init="message='test'" ng-model="message" >
   <button ng-click="callNotify(message);">NOTIFY</button>
+  <p>(you have to click 3 times to see an alert)</p>
 </div>
 </doc:source>
 <doc:scenario>

docs/content/guide/dev_guide.templates.filters.creating_filters.ngdoc

@@ -8,7 +8,7 @@ as the first argument. Any filter arguments are passed in as additional argument
 function.
 
 The following sample filter reverses a text string. In addition, it conditionally makes the
-text upper-case and assigns color.
+text upper-case.
 
 <doc:example module="MyReverseModule">
 <doc:source>

docs/content/guide/di.ngdoc

@@ -24,7 +24,7 @@ There are only three ways an object or a function can get a hold of its dependen
 
 
 The first two options of creating or looking up dependencies are not optimal because they hard
-code the dependency. This make it difficult, if not impossible, to modify the dependencies.
+code the dependency. This makes it difficult, if not impossible, to modify the dependencies.
 This is especially problematic in tests, where it is often desirable to provide mock dependencies
 for test isolation.
 
@@ -196,18 +196,20 @@ DI is pervasive throughout Angular. It is typically used in controllers and fact
 ### DI in controllers
 
 Controllers are classes which are responsible for application behavior. The recommended way of 
-declaring controllers is:
+declaring controllers is using the array notation:
 
 <pre>
-  var MyController = function($scope, dep1, dep2) {
+  someModule.controller('MyController', ['$scope', 'dep1', 'dep2', function($scope, dep1, dep2) {
     ...
     $scope.aMethod = function() {
       ...
     }
-  }
-  MyController.$inject = ['$scope', 'dep1', 'dep2'];
+    ...
+  }]);
 </pre>
 
+This avoids the creation of global functions for controllers and also protects against minification.
+
 
 ### Factory methods
 

docs/content/guide/directive.ngdoc

@@ -269,7 +269,8 @@ Here's an example directive declared with a Directive Definition Object:
       transclude: false,
       restrict: 'A',
       scope: false,
-      controller: function($scope, $element, $attrs, $transclude, otherInjectables) { ... },
+      controller: ["$scope", "$element", "$attrs", "$transclude", "otherInjectables",
+        function($scope, $element, $attrs, $transclude, otherInjectables) { ... }],
       compile: function compile(tElement, tAttrs, transclude) {
         return {
           pre: function preLink(scope, iElement, iAttrs, controller) { ... },

docs/content/guide/overview.ngdoc

@@ -134,7 +134,7 @@ These input widgets look normal enough, but consider these points:
     Model-View-Controller design pattern.
   * Note that the HTML widget {@link api/ng.directive:input input}
     has special powers. The input invalidates itself by turning red when you enter invalid data or
-    leave the the input fields blank. These new widget behaviors make it easier to implement field
+    leave the input fields blank. These new widget behaviors make it easier to implement field
     validation common in CRUD applications.
 
 And finally, the mysterious `{{ double curly braces }}`:

docs/content/misc/contribute.ngdoc

@@ -256,31 +256,27 @@ To create and submit a change:
    [print, sign and one of scan+email, fax or mail the form](http://code.google.com/legal/corporate-cla-v1.0.html).
 
 
-2. Create a new branch off the master for your changes:
+2. Create and checkout a new branch off the master branch for your changes:
 
-        git branch my-fix-branch
+        git checkout -b my-fix-branch master
 
-3. Check out the branch:
+3. Create your patch, make sure to have plenty of tests (that pass).
 
-        git checkout my-fix-branch
-
-4. Create your patch, make sure to have plenty of tests (that pass).
-
-5. Commit your changes and create a descriptive commit message (the commit message is used to generate release notes,
+4. Commit your changes and create a descriptive commit message (the commit message is used to generate release notes,
    please check out our
    [commit message conventions](https://docs.google.com/document/d/1QrDFcIiPjSLDn3EL15IJygNPiHORgU1_OOAqWjiDU5Y/edit#)
    and our commit message presubmit hook `validate-commit-msg.js`):
 
         git commit -a
 
-6. Push your branch to Github:
+5. Push your branch to Github:
 
         git push origin my-fix-branch
 
-7. In Github, send a pull request to `angular:master`.
+6. In Github, send a pull request to `angular:master`.
 
 
-8. When the patch is reviewed and merged, delete your branch and pull yours — and other — changes
+7. When the patch is reviewed and merged, delete your branch and pull yours — and other — changes
 from the main (upstream) repository:
 
   1. To delete the branch in Github, run: