chore(ngdoc): fix misspellling of Naturally in sortVersionsNatrually

Corrects "sortVersionsNatrually" method name in `ngdoc.js` in "sortVersionsNaturally"

CHANGELOG.md

@@ -82,6 +82,30 @@
   ([4ae3184c](https://github.com/angular/angular.js/commit/4ae3184c5915aac9aa00889aa2153c8e84c14966),
    [#4278](https://github.com/angular/angular.js/issues/4278), [#4225](https://github.com/angular/angular.js/issues/4225))
 
+## Breaking Changes
+
+- **$http:** due to [e1cfb195](https://github.com/angular/angular.js/commit/e1cfb1957feaf89408bccf48fae6f529e57a82fe),
+	   it is now necessary to seperately specify default HTTP headers for PUT, POST and PATCH requests, as these no longer share a single object.
+		 
+	To migrate your code, follow the example below:
+	
+	Before:
+	
+		// Will apply to POST, PUT and PATCH methods
+		$httpProvider.defaults.headers.post = {
+			"X-MY-CSRF-HEADER": "..."
+		};
+
+	After:
+
+		// POST, PUT and PATCH default headers must be specified seperately,
+		// as they do not share data.
+		$httpProvider.defaults.headers.post =
+			$httpProvider.defaults.headers.put =
+			$httpProviders.defaults.headers.patch = {
+				"X-MY-CSRF-HEADER": "..."
+			};
+
 <a name="1.2.8"></a>
 # 1.2.8 interdimensional-cartography (2014-01-10)
 

Gruntfile.js

@@ -4,18 +4,8 @@ var path = require('path');
 
 module.exports = function(grunt) {
   //grunt plugins
-  grunt.loadNpmTasks('grunt-bump');
-  grunt.loadNpmTasks('grunt-contrib-clean');
-  grunt.loadNpmTasks('grunt-contrib-connect');
-  grunt.loadNpmTasks('grunt-contrib-compress');
-  grunt.loadNpmTasks('grunt-contrib-copy');
-  grunt.loadNpmTasks('grunt-contrib-jshint');
-  grunt.loadNpmTasks('grunt-ddescribe-iit');
-  grunt.loadNpmTasks('grunt-jasmine-node');
-  grunt.loadNpmTasks("grunt-jscs-checker");
-  grunt.loadNpmTasks('grunt-merge-conflict');
-  grunt.loadNpmTasks('grunt-parallel');
-  grunt.loadNpmTasks('grunt-shell');
+  require('load-grunt-tasks')(grunt);
+
   grunt.loadTasks('lib/grunt');
 
   var NG_VERSION = util.getVersion();

LICENSE

@@ -1,6 +1,6 @@
 The MIT License
 
-Copyright (c) 2010-2012 Google, Inc. http://angularjs.org
+Copyright (c) 2010-2014 Google, Inc. http://angularjs.org
 
 Permission is hereby granted, free of charge, to any person obtaining a copy
 of this software and associated documentation files (the "Software"), to deal

docs/src/ngdoc.js

@@ -51,7 +51,7 @@ exports.ngVersions = function() {
     });
 
   //match the future version of AngularJS that is set in the package.json file
-  return expandVersions(sortVersionsNatrually(versions), exports.ngCurrentVersion().full);
+  return expandVersions(sortVersionsNaturally(versions), exports.ngCurrentVersion().full);
 
   function expandVersions(versions, latestVersion) {
     var RC_VERSION = /rc\d/;
@@ -87,7 +87,7 @@ exports.ngVersions = function() {
     return expanded;
   };
 
-  function sortVersionsNatrually(versions) {
+  function sortVersionsNaturally(versions) {
     var versionMap = {},
         NON_RC_RELEASE_NUMBER = 999;
     for(var i = versions.length - 1; i >= 0; i--) {

lib/grunt/utils.js

@@ -2,6 +2,7 @@ var fs = require('fs');
 var shell = require('shelljs');
 var grunt = require('grunt');
 var spawn = require('child_process').spawn;
+var semver = require('semver');
 var version;
 var CSP_CSS_HEADER = '/* Include this file in your html if you are using the CSP mode. */\n\n';
 
@@ -32,31 +33,82 @@ module.exports = {
 
   getVersion: function(){
     if (version) return version;
-
     var package = JSON.parse(fs.readFileSync('package.json', 'UTF-8'));
-    var match = package.version.match(/^([^\-]*)(?:\-(.+))?$/);
-    var semver = match[1].split('.');
+    try {
 
-    var fullVersion = match[1];
+      var gitTag = getTagOfCurrentCommit();
+      var semVerVersion, codeName, fullVersion;
+      if (gitTag) {
+        // tagged release
+        fullVersion = semVerVersion = semver.valid(gitTag);
+        codeName = getTaggedReleaseCodeName(gitTag);
+      } else {
+        // snapshot release
+        semVerVersion = getSnapshotVersion();
+        fullVersion = semVerVersion + '-' + getSnapshotSuffix();
+        codeName = 'snapshot'
+      }
 
-    if (match[2]) {
-      fullVersion += '-';
-      fullVersion += (match[2] == 'snapshot') ? getSnapshotSuffix() : match[2];
+      var versionParts = semVerVersion.match(/(\d+)\.(\d+)\.(\d+)/);
+
+      version = {
+        full: fullVersion,
+        major: versionParts[1],
+        minor: versionParts[2],
+        dot: versionParts[3],
+        codename: codeName,
+        cdn: package.cdnVersion
+      };
+
+      return version;
+
+    } catch (e) {
+      grunt.fail.warn(e);
     }
 
-    version = {
-      full: fullVersion,
-      major: semver[0],
-      minor: semver[1],
-      dot: semver[2].replace(/rc\d+/, ''),
-      codename: package.codename,
-      cdn: package.cdnVersion
-    };
+    function getTagOfCurrentCommit() {
+      var gitTagResult = shell.exec('git describe --exact-match', {silent:true});
+      var gitTagOutput = gitTagResult.output.trim();
+      var branchVersionPattern = new RegExp(package.branchVersion.replace('.', '\\.').replace('*', '\\d+'));
+      if (gitTagResult.code === 0 && gitTagOutput.match(branchVersionPattern)) {
+        return gitTagOutput;
+      } else {
+        return null;
+      }
+    }
 
-    return version;
+    function getTaggedReleaseCodeName(tagName) {
+      var tagMessage = shell.exec('git cat-file -p '+ tagName +' | grep "codename"', {silent:true}).output;
+      var codeName = tagMessage && tagMessage.match(/codename\((.*)\)/)[1];
+      if (!codeName) {
+        throw new Error("Could not extract release code name. The message of tag "+tagName+
+          " must match '*codename(some release name)*'");
+      }
+      return codeName;
+    }
+
+    function getSnapshotVersion() {
+      var oldTags = shell.exec('git tag -l v'+package.branchVersion, {silent:true}).output.trim().split('\n');
+      // ignore non semver versions.
+      oldTags = oldTags.filter(function(version) {
+        return version && semver.valid(version);
+      });
+      if (oldTags.length) {
+        oldTags.sort(semver.compare);
+        semVerVersion = oldTags[oldTags.length-1];
+        if (semVerVersion.indexOf('-') !== -1) {
+          semVerVersion = semver.inc(semVerVersion, 'prerelease');
+        } else {
+          semVerVersion = semver.inc(semVerVersion, 'patch');
+        }
+      } else {
+        semVerVersion = semver.valid(package.branchVersion.replace(/\*/g, '0'));
+      }
+      return semVerVersion;
+    }
 
     function getSnapshotSuffix() {
-      var jenkinsBuild = process.env.BUILD_NUMBER || 'local';
+      var jenkinsBuild = process.env.TRAVIS_BUILD_NUMBER || process.env.BUILD_NUMBER || 'local';
       var hash = shell.exec('git rev-parse --short HEAD', {silent: true}).output.replace('\n', '');
       return 'build.'+jenkinsBuild+'+sha.'+hash;
     }

package.json

@@ -1,20 +1,27 @@
 {
   "name": "angularjs",
-  "version": "1.2.11",
-  "cdnVersion": "1.2.10",
-  "codename": "cryptocurrency-hyperdeflation",
+  "branchVersion": "1.2.*",
+  "cdnVersion": "1.2.11",
   "repository": {
     "type": "git",
     "url": "https://github.com/angular/angular.js.git"
   },
   "devDependencies": {
     "grunt": "~0.4.2",
-    "bower": "~1.2.2",
     "grunt-bump": "~0.0.13",
     "grunt-contrib-clean": "~0.5.0",
-    "grunt-contrib-compress": "~0.5.2",
     "grunt-contrib-connect": "~0.5.0",
+    "grunt-contrib-compress": "~0.5.2",
     "grunt-contrib-copy": "~0.4.1",
+    "grunt-contrib-jshint": "~0.7.2",
+    "grunt-ddescribe-iit": "~0.0.1",
+    "grunt-jasmine-node": "git://github.com/vojtajina/grunt-jasmine-node.git#fix-grunt-exit-code",
+    "grunt-jscs-checker": "~0.3.2",
+    "grunt-merge-conflict": "~0.0.1",
+    "grunt-parallel": "~0.3.1",
+    "grunt-shell": "~0.4.0",
+    "load-grunt-tasks": "~0.3.0",
+    "bower": "~1.2.2",
     "jasmine-node": "~1.11.0",
     "q": "~0.9.2",
     "q-io": "~1.10.6",
@@ -33,16 +40,10 @@
     "yaml-js": "~0.0.8",
     "marked": "0.2.9",
     "rewire": "1.1.3",
-    "grunt-jasmine-node": "git://github.com/vojtajina/grunt-jasmine-node.git#fix-grunt-exit-code",
-    "grunt-parallel": "~0.3.1",
-    "grunt-ddescribe-iit": "~0.0.1",
-    "grunt-merge-conflict": "~0.0.1",
     "promises-aplus-tests": "~1.3.2",
-    "grunt-shell": "~0.4.0",
     "semver": "~2.1.0",
     "lodash": "~2.1.0",
-    "browserstacktunnel-wrapper": "~1.1.1",
-    "grunt-jscs-checker": "~0.3.2"
+    "browserstacktunnel-wrapper": "~1.1.1"
   },
   "licenses": [
     {
@@ -50,7 +51,5 @@
       "url": "https://github.com/angular/angular.js/blob/master/LICENSE"
     }
   ],
-  "dependencies": {
-    "grunt-contrib-jshint": "~0.7.2"
-  }
+  "dependencies": {}
 }

scripts/angular.js/finalize-version.sh

@@ -1,20 +0,0 @@
-#!/bin/bash
-
-echo "############################################"
-echo "##  Remove "-snapshot" from version ########"
-echo "############################################"
-
-ARG_DEFS=()
-
-function run {
-  cd ../..
-
-  replaceJsonProp "package.json" "version" "(.*)-snapshot" "\2"
-  VERSION=$(readJsonProp "package.json" "version")
-
-  git add package.json
-  git commit -m "chore(release): cut v$VERSION release"
-  git tag -m "v$VERSION" v$VERSION
-}
-
-source $(dirname $0)/../utils.inc

scripts/angular.js/initialize-new-version.sh

@@ -1,24 +0,0 @@
-#!/bin/bash
-
-echo "############################################"
-echo "##  Increment version, add "-snapshot" and set version name ##"
-echo "############################################"
-
-ARG_DEFS=(
-  "--next-version-type=(patch|minor|major)"
-  "--next-version-name=(.+)"
-)
-
-function run {
-  cd ../..
-
-  grunt bump:$NEXT_VERSION_TYPE
-  NEXT_VERSION=$(readJsonProp "package.json" "version")
-  replaceJsonProp "package.json" "version" "(.*)" "\2-snapshot"
-  replaceJsonProp "package.json" "codename" ".*" "$NEXT_VERSION_NAME"
-
-  git add package.json
-  git commit -m "chore(release): start v$NEXT_VERSION ($NEXT_VERSION)"
-}
-
-source $(dirname $0)/../utils.inc

scripts/angular.js/publish.sh

@@ -1,42 +0,0 @@
-#!/bin/bash
-
-# Script for updating angular.js repo from current local build.
-
-echo "#################################"
-echo "##     Update angular.js      ###"
-echo "#################################"
-
-ARG_DEFS=(
-  "--action=(prepare|publish)"
- "--next-version-type=(patch|minor|major)"
- "--next-version-name=(.+)"
- "[--no-test=(true|false)]"
-)
-
-function init {
-  cd ../..
-}
-
-function prepare() {
-  ./scripts/angular.js/finalize-version.sh
-
-  # Build
-  if [[ $NO_TEST == "true" ]]; then
-    npm install --color false
-    grunt ci-checks package --no-color
-  else
-    ./jenkins_build.sh
-  fi
-
-  ./scripts/angular.js/initialize-new-version.sh --next-version-type=$NEXT_VERSION_TYPE --next-version-name=$NEXT_VERSION_NAME
-}
-
-function publish() {
-  BRANCH=$(git rev-parse --abbrev-ref HEAD)
-  # push the commits to github
-  git push origin $BRANCH
-  # push the release tag
-  git push origin v`cat build/version.txt`
-}
-
-source $(dirname $0)/../utils.inc

scripts/angular.js/tag-release.sh

@@ -0,0 +1,42 @@
+#!/bin/bash
+
+# Tags a release
+# so that travis can do the actual release.
+
+echo "#################################"
+echo "## Tag angular.js for a release #"
+echo "#################################"
+
+ARG_DEFS=(
+  "--action=(prepare|publish)"
+  "--commit-sha=(.*)"
+  # the version number of the release.
+  # e.g. 1.2.12 or 1.2.12-rc.1
+  "--version-number=([0-9]+\.[0-9]+\.[0-9]+(-[a-z]+\.[0-9]+)?)"
+  "--version-name=(.+)"
+)
+
+function checkVersionNumber() {
+  BRANCH_PATTERN=$(readJsonProp "package.json" "branchVersion")
+  if [[ $VERSION_NUMBER != $BRANCH_PATTERN ]]; then
+    echo "version-number needs to match $BRANCH_PATTERN on this branch"
+    usage
+  fi
+}
+
+function init {
+  cd ../..
+  checkVersionNumber
+  TAG_NAME="v$VERSION_NUMBER"
+}
+
+function prepare() {
+  git tag "$TAG_NAME" -m "chore(release): $TAG_NAME codename($VERSION_NAME)" "$COMMIT_SHA"
+}
+
+function publish() {
+  # push the tag to github
+  git push origin $TAG_NAME
+}
+
+source $(dirname $0)/../utils.inc

scripts/jenkins/release.sh

@@ -1,38 +1,63 @@
 #!/bin/bash
 
+# tags the current commit as a release and publishes all artifacts to
+# the different repositories.
+# Note: This will also works if the commit is in the past!
+
 echo "#################################"
-echo "#### Cut release ################"
+echo "#### cut release     ############"
 echo "#################################"
 
 ARG_DEFS=(
-  "--next-version-type=(patch|minor|major)"
-  "--next-version-name=(.+)"
   # require the git dryrun flag so the script can't be run without
   # thinking about this!
   "--git-push-dryrun=(true|false)"
-  "[--no-test=(true|false)]"
+  # The sha to release. Needs to be the same as HEAD.
+  # given as parameter to double check.
+  "--commit-sha=(.*)"
+  # the version number of the release.
+  # e.g. 1.2.12 or 1.2.12-rc.1
+  "--version-number=([0-9]+\.[0-9]+\.[0-9]+(-[a-z]+\.[0-9]+)?)"
+  # the codename of the release
+  "--version-name=(.+)"
 )
 
 function init {
-  NG_ARGS=("$@")
+  if [[ $(git rev-parse --short HEAD) != $COMMIT_SHA ]]; then
+    echo "HEAD is not at $COMMIT_SHA"
+    usage
+  fi
+
   if [[ ! $VERBOSE ]]; then
     VERBOSE=false
   fi
-  if [[ ! $NO_TEST ]]; then
-    NO_TEST=false
-  fi
   VERBOSE_ARG="--verbose=$VERBOSE"
-  NO_TEST_ARG="--no_test=$NO_TEST"
+}
+
+function build {
+  cd ../..
+
+  npm install --color false
+  grunt ci-checks package --no-color
+
+  cd $SCRIPT_DIR
 }
 
 function phase {
   ACTION_ARG="--action=$1"
-  ../angular.js/publish.sh $ACTION_ARG $VERBOSE_ARG $NO_TEST_ARG \
-      --next-version-type=$NEXT_VERSION_TYPE --next-version-name=$NEXT_VERSION_NAME
+  ../angular.js/tag-release.sh $ACTION_ARG $VERBOSE_ARG\
+    --version-number=$VERSION_NUMBER --version-name=$VERSION_NAME\
+    --commit-sha=$COMMIT_SHA
+
+  if [[ $1 == "prepare" ]]; then
+    # The build requires the tag to be set already!
+    build
+  fi
+
   ../code.angularjs.org/publish.sh $ACTION_ARG $VERBOSE_ARG
   ../bower/publish.sh $ACTION_ARG $VERBOSE_ARG
-  ../angular-seed/publish.sh $ACTION_ARG $VERBOSE_ARG $NO_TEST_ARG
-  ../angular-phonecat/publish.sh $ACTION_ARG $VERBOSE_ARG $NO_TEST_ARG
+  ../angular-seed/publish.sh $ACTION_ARG $VERBOSE_ARG --no-test=true
+  ../angular-phonecat/publish.sh $ACTION_ARG $VERBOSE_ARG --no-test=true
 }
 
 function run {

src/Angular.js

@@ -772,7 +772,7 @@ function shallowCopy(src, dst) {
   for(var key in src) {
     // shallowCopy is only ever called by $compile nodeLinkFn, which has control over src
     // so we don't need to worry about using our custom hasOwnProperty here
-    if (src.hasOwnProperty(key) && key.charAt(0) !== '$' && key.charAt(1) !== '$') {
+    if (src.hasOwnProperty(key) && !(key.charAt(0) === '$' && key.charAt(1) === '$')) {
       dst[key] = src[key];
     }
   }

src/jqLite.js

@@ -175,6 +175,9 @@ function JQLite(element) {
   if (element instanceof JQLite) {
     return element;
   }
+  if (isString(element)) {
+    element = trim(element);
+  }
   if (!(this instanceof JQLite)) {
     if (isString(element) && element.charAt(0) != '<') {
       throw jqLiteMinErr('nosel', 'Looking up elements via selectors is not supported by jqLite! See: http://docs.angularjs.org/api/angular.element');

src/ng/compile.js

@@ -1196,7 +1196,7 @@ function $CompileProvider($provide, $$sanitizeUriProvider) {
           hasTranscludeDirective = true;
 
           // Special case ngIf and ngRepeat so that we don't complain about duplicate transclusion.
-          // This option should only be used by directives that know how to how to safely handle element transclusion,
+          // This option should only be used by directives that know how to safely handle element transclusion,
           // where the transcluded nodes are added or replaced after linking.
           if (!directive.$$tlb) {
             assertNoDuplicate('transclusion', nonTlbTranscludeDirective, directive, $compileNode);

src/ng/directive/ngClass.js

@@ -133,7 +133,6 @@ function classDirective(name, selector) {
          expect(ps.get(1).getAttribute('class')).toBe('');
          element(by.model('style')).clear();
          element(by.model('style')).sendKeys('red');
-         browser.debugger();
          expect(ps.get(1).getAttribute('class')).toBe('red');
        });
 

src/ng/httpBackend.js

@@ -107,7 +107,20 @@ function createHttpBackend($browser, createXhr, $browserDefer, callbacks, rawDoc
       }
 
       if (responseType) {
-        xhr.responseType = responseType;
+        try {
+          xhr.responseType = responseType;
+        } catch (e) {
+          // WebKit added support for the json responseType value on 09/03/2013
+          // https://bugs.webkit.org/show_bug.cgi?id=73648. Versions of Safari prior to 7 are
+          // known to throw when setting the value "json" as the response type. Other older
+          // browsers implementing the responseType 
+          //
+          // The json response type can be ignored if not supported, because JSON payloads are
+          // parsed on the client-side regardless.
+          if (responseType !== 'json') {
+            throw e;
+          }
+        }
       }
 
       xhr.send(post || null);

src/ng/log.js

@@ -51,7 +51,7 @@ function $LogProvider(){
    * @name ng.$logProvider#debugEnabled
    * @methodOf ng.$logProvider
    * @description
-   * @param {string=} flag enable or disable debug level messages
+   * @param {boolean=} flag enable or disable debug level messages
    * @returns {*} current value if used as getter or itself (chaining) if used as setter
    */
   this.debugEnabled = function(flag) {

src/ng/q.js

@@ -73,7 +73,7 @@
  *   constructed via `$q.reject`, the promise will be rejected instead.
  * - `reject(reason)` – rejects the derived promise with the `reason`. This is equivalent to
  *   resolving it with a rejection constructed via `$q.reject`.
- * - `notify(value)` - provides updates on the status of the promises execution. This may be called
+ * - `notify(value)` - provides updates on the status of the promise's execution. This may be called
  *   multiple times before the promise is either resolved or rejected.
  *
  * **Properties**

src/ngMock/angular-mocks.js

@@ -504,6 +504,7 @@ angular.mock.$IntervalProvider = function() {
     };
 
     $interval.cancel = function(promise) {
+      if(!promise) return false;
       var fnIndex;
 
       angular.forEach(repeatFns, function(fn, index) {
@@ -2138,9 +2139,8 @@ if(window.jasmine || window.mocha) {
       }
       for(var i = 0, ii = blockFns.length; i < ii; i++) {
         try {
-          /* jshint -W040 *//* Jasmine explicitly provides a `this` object when calling functions */
-          injector.invoke(blockFns[i] || angular.noop, this);
-          /* jshint +W040 */
+          // jasmine sets this to be the current spec, so we are mimicing that
+          injector.invoke(blockFns[i] || angular.noop, currentSpec);
         } catch (e) {
           if (e.stack && errorForStack) {
             throw new ErrorAddingDeclarationLocationStack(e, errorForStack);

src/ngResource/resource.js

@@ -35,7 +35,7 @@ function shallowClearAndCopy(src, dst) {
   });
 
   for (var key in src) {
-    if (src.hasOwnProperty(key) && key.charAt(0) !== '$' && key.charAt(1) !== '$') {
+    if (src.hasOwnProperty(key) && !(key.charAt(0) === '$' && key.charAt(1) === '$')) {
       dst[key] = src[key];
     }
   }

test/AngularSpec.js

@@ -190,7 +190,7 @@ describe('angular', function() {
       expect(copy.key).toBe(original.key);
     });
 
-    it('should not copy $$ properties nor prototype properties', function() {
+    it('should omit "$$"-prefixed properties', function() {
       var original = {$$some: true, $$: true};
       var clone = {};
 
@@ -198,6 +198,27 @@ describe('angular', function() {
       expect(clone.$$some).toBeUndefined();
       expect(clone.$$).toBeUndefined();
     });
+
+    it('should copy "$"-prefixed properties from copy', function() {
+      var original = {$some: true};
+      var clone = {};
+
+      expect(shallowCopy(original, clone)).toBe(clone);
+      expect(clone.$some).toBe(original.$some);
+    });
+
+    it('should omit properties from prototype chain', function() {
+      var original, clone = {};
+      function Func() {};
+      Func.prototype.hello = "world";
+
+      original = new Func();
+      original.goodbye = "world";
+
+      expect(shallowCopy(original, clone)).toBe(clone);
+      expect(clone.hello).toBeUndefined();
+      expect(clone.goodbye).toBe("world");
+    });
   });
 
   describe('elementHTML', function() {

test/jqLiteSpec.js

@@ -65,6 +65,17 @@ describe('jqLite', function() {
     });
 
 
+    it('should allow construction of html with leading whitespace', function() {
+      var nodes = jqLite('  \n\r   \r\n<div>1</div><span>2</span>');
+      expect(nodes[0].parentNode).toBeDefined();
+      expect(nodes[0].parentNode.nodeType).toBe(11); /** Document Fragment **/;
+      expect(nodes[0].parentNode).toBe(nodes[1].parentNode);
+      expect(nodes.length).toBe(2);
+      expect(nodes[0].innerHTML).toBe('1');
+      expect(nodes[1].innerHTML).toBe('2');
+    });
+
+
     it('should allow creation of comment tags', function() {
       var nodes = jqLite('<!-- foo -->');
       expect(nodes.length).toBe(1);

test/ngMock/angular-mocksSpec.js

@@ -509,6 +509,11 @@ describe('ngMock', function() {
 
       it('should not throw a runtime exception when given an undefined promise',
           inject(function($interval) {
+        var task1 = jasmine.createSpy('task1'),
+            promise1;
+
+        promise1 = $interval(task1, 1000, 1);
+
         expect($interval.cancel()).toBe(false);
       }));
     });
@@ -864,6 +869,25 @@ describe('ngMock', function() {
       });
 
 
+      describe('this', function() {
+
+        it('should set `this` to be the jasmine context', inject(function() {
+          expect(this instanceof jasmine.Spec).toBe(true);
+        }));
+
+        it('should set `this` to be the jasmine context when inlined in a test', function() {
+          var tested = false;
+
+          inject(function() {
+            expect(this instanceof jasmine.Spec).toBe(true);
+            tested = true;
+          });
+
+          expect(tested).toBe(true);
+        });
+      });
+
+
       // We don't run the following tests on IE8.
       // IE8 throws "Object does not support this property or method." error,
       // when thrown from a function defined on window (which `inject` is).

test/ngResource/resourceSpec.js

@@ -94,6 +94,49 @@ describe("resource", function() {
   });
 
 
+  describe('shallow copy', function() {
+    it('should make a copy', function() {
+      var original = {key:{}};
+      var copy = shallowClearAndCopy(original);
+      expect(copy).toEqual(original);
+      expect(copy.key).toBe(original.key);
+    });
+
+
+    it('should omit "$$"-prefixed properties', function() {
+      var original = {$$some: true, $$: true};
+      var clone = {};
+
+      expect(shallowClearAndCopy(original, clone)).toBe(clone);
+      expect(clone.$$some).toBeUndefined();
+      expect(clone.$$).toBeUndefined();
+    });
+
+
+    it('should copy "$"-prefixed properties from copy', function() {
+      var original = {$some: true};
+      var clone = {};
+
+      expect(shallowClearAndCopy(original, clone)).toBe(clone);
+      expect(clone.$some).toBe(original.$some);
+    });
+
+
+    it('should omit properties from prototype chain', function() {
+      var original, clone = {};
+      function Func() {};
+      Func.prototype.hello = "world";
+
+      original = new Func();
+      original.goodbye = "world";
+
+      expect(shallowClearAndCopy(original, clone)).toBe(clone);
+      expect(clone.hello).toBeUndefined();
+      expect(clone.goodbye).toBe("world");
+    });
+  });
+
+
   it('should default to empty parameters', function() {
     $httpBackend.expect('GET', 'URL').respond({});
     $resource('URL').query();