jasmine-core - npm Package Compare versions

Comparing version 2.1.3 to 2.2.0

CONTRIBUTING.md

@@ -12,4 +12,4 @@ # Developing for Jasmine Core
 1. Change directory: (`cd jasmine`)                                                                                                                                                               
-1. Asign original repository to a remote named 'upstream': (`git remote add                                                                                                                       
-upstream https://github.com/pivotal/jasmine.git`)                                                                                                                                                 
+1. Assign original repository to a remote named 'upstream': (`git remote add                                                                                                                       
+upstream https://github.com/jasmine/jasmine.git`)                                                                                                                                                 
 1. Pull in changes not present in your local repository: (`git fetch upstream`)
@@ -71,4 +71,8 @@ 1. Create your feature branch (`git checkout -b my-new-feature`)
 
-...will install all of the Ruby dependencies.
+...will install all of the Ruby dependencies. If the ffi gem fails to build its native extensions, you may need to manually install some system dependencies. On Ubuntu:
 
+    $ apt-get install gcc ruby ruby-dev libxml2 libxml2-dev libxslt1-dev
+
+...should get you to the point that `bundle` can install everything.
+
 To install the Node dependencies, you will need Node.js, Npm, and [Grunt](http://gruntjs.com/), the [grunt-cli](https://github.com/gruntjs/grunt-cli) and ensure that `grunt` is on your path.
@@ -99,3 +103,3 @@
 
-Jasmine uses the [Jasmine Ruby gem](http://github.com/pivotal/jasmine-gem) to test itself in browser.
+Jasmine uses the [Jasmine Ruby gem](http://github.com/jasmine/jasmine-gem) to test itself in browser.
 
@@ -106,3 +110,3 @@ $ rake jasmine
 
-Jasmine uses the [Jasmine NPM package](http://github.com/pivotal/jasmine-npm) to test itself in a Node.js/npm environment.
+Jasmine uses the [Jasmine NPM package](http://github.com/jasmine/jasmine-npm) to test itself in a Node.js/npm environment.
 
@@ -109,0 +113,0 @@ $ grunt execSpecsInNode

lib/console/console.js

 /*
-Copyright (c) 2008-2014 Pivotal Labs
+Copyright (c) 2008-2015 Pivotal Labs
 
@@ -4,0 +4,0 @@ Permission is hereby granted, free of charge, to any person obtaining

lib/jasmine-core/boot.js

 /*
-Copyright (c) 2008-2014 Pivotal Labs
+Copyright (c) 2008-2015 Pivotal Labs
 
@@ -87,3 +87,4 @@ Permission is hereby granted, free of charge, to any person obtaining
     env: env,
-    onRaiseExceptionsClick: function() { queryString.setParam("catch", !env.catchingExceptions()); },
+    onRaiseExceptionsClick: function() { queryString.navigateWithNewParam("catch", !env.catchingExceptions()); },
+    addToExistingQueryString: function(key, value) { return queryString.fullStringWithNewParam(key, value); },
     getContainer: function() { return document.body; },
@@ -90,0 +91,0 @@ createElement: function() { return document.createElement.apply(document, arguments); },

lib/jasmine-core/jasmine-html.js

 /*
-Copyright (c) 2008-2014 Pivotal Labs
+Copyright (c) 2008-2015 Pivotal Labs
 
@@ -43,2 +43,3 @@ Permission is hereby granted, free of charge, to any person obtaining
       onRaiseExceptionsClick = options.onRaiseExceptionsClick || function() {},
+      addToExistingQueryString = options.addToExistingQueryString || defaultQueryString,
       timer = options.timer || noopTimer,
@@ -224,2 +225,5 @@ results = [],
             }
+            if(resultNode.result.status === 'pending' && resultNode.result.pendingReason !== '') {
+              specDescription = specDescription + ' PENDING WITH MESSAGE: ' + resultNode.result.pendingReason;
+            }
             specListNode.appendChild(
@@ -272,3 +276,3 @@ createDom('li', {
       var oldReporter = find('');
-      
+
       if(oldReporter) {
@@ -312,5 +316,9 @@ getContainer().removeChild(oldReporter);
     function specHref(result) {
-      return '?spec=' + encodeURIComponent(result.fullName);
+      return addToExistingQueryString('spec', result.fullName);
     }
 
+    function defaultQueryString(key, value) {
+      return '?' + key + '=' + value;
+    }
+
     function setMenuModeTo(mode) {
@@ -365,6 +373,10 @@ htmlReporterMain.setAttribute('class', 'jasmine_html-reporter ' + mode);
 
-    this.setParam = function(key, value) {
+    this.navigateWithNewParam = function(key, value) {
+      options.getWindowLocation().search = this.fullStringWithNewParam(key, value);
+    };
+
+    this.fullStringWithNewParam = function(key, value) {
       var paramMap = queryStringToParamMap();
       paramMap[key] = value;
-      options.getWindowLocation().search = toQueryString(paramMap);
+      return toQueryString(paramMap);
     };
@@ -371,0 +383,0 @@

lib/jasmine-core/node_boot.js

 /*
-Copyright (c) 2008-2014 Pivotal Labs
+Copyright (c) 2008-2015 Pivotal Labs
 
@@ -4,0 +4,0 @@ Permission is hereby granted, free of charge, to any person obtaining

package.json

 {
   "name": "jasmine-core",
   "license": "MIT",
-  "version": "2.1.3",
+  "version": "2.2.0",
   "repository": {
     "type": "git",
-    "url": "https://github.com/pivotal/jasmine.git"
+    "url": "https://github.com/jasmine/jasmine.git"
   },
@@ -20,5 +20,5 @@ "description": "Official packaging of Jasmine's core files for use by Node.js projects.",
     "glob": "~3.2.9",
-    "jasmine": "https://github.com/pivotal/jasmine-npm/archive/master.tar.gz",
+    "jasmine": "https://github.com/jasmine/jasmine-npm/archive/master.tar.gz",
     "load-grunt-tasks": "^0.4.0"
   }
 }

README.md

@@ -1,2 +0,2 @@
-<a name="README">[<img src="https://rawgithub.com/pivotal/jasmine/master/images/jasmine-horizontal.svg" width="400px" />](http://jasmine.github.io)</a> 
+<a name="README">[<img src="https://rawgithub.com/jasmine/jasmine/master/images/jasmine-horizontal.svg" width="400px" />](http://jasmine.github.io)</a> 
 
@@ -14,13 +14,22 @@ [![Build Status](https://travis-ci.org/jasmine/jasmine.png?branch=master)](https://travis-ci.org/jasmine/jasmine) [![Code Climate](https://codeclimate.com/github/pivotal/jasmine.png)](https://codeclimate.com/github/pivotal/jasmine)
 
-Upgrading from Jasmine 1.x? Check out the [2.0 release notes](https://github.com/pivotal/jasmine/blob/v2.0.0/release_notes/20.md) for a list of what's new (including breaking interface changes).
+Upgrading from Jasmine 1.x? Check out the [2.0 release notes](https://github.com/jasmine/jasmine/blob/v2.0.0/release_notes/20.md) for a list of what's new (including breaking interface changes). You can also read the [upgrade guide](http://jasmine.github.io/2.0/upgrading.html).
 
 ## Contributing
 
-Please read the [contributors' guide](https://github.com/pivotal/jasmine/blob/master/CONTRIBUTING.md)
+Please read the [contributors' guide](https://github.com/jasmine/jasmine/blob/master/CONTRIBUTING.md)
 
 ## Installation
 
+For the Jasmine NPM module:<br>
+[https://github.com/jasmine/jasmine-npm](https://github.com/jasmine/jasmine-npm)
+
+For the Jasmine Ruby Gem:<br>
+[https://github.com/jasmine/jasmine-gem](https://github.com/jasmine/jasmine-gem)
+
+For the Jasmine Python Egg:<br>
+[https://github.com/jasmine/jasmine-py](https://github.com/jasmine/jasmine-py)
+
 To install Jasmine on your local box:
 
-* Clone Jasmine - `git clone https://github.com/pivotal/jasmine.git`
+* Clone Jasmine - `git clone https://github.com/jasmine/jasmine.git`
 * Create a Jasmine directory in your project - `mkdir my-project/jasmine`
@@ -40,10 +49,7 @@ * Move latest dist to your project directory - `mv jasmine/dist/jasmine-standalone-2.0.0.zip my-project/jasmine`
 
-For the Jasmine Ruby Gem:<br>
-[https://github.com/pivotal/jasmine-gem](https://github.com/pivotal/jasmine-gem)
+## Supported environments
 
-For the Jasmine Python Egg:<br>
-[https://github.com/pivotal/jasmine-py](https://github.com/pivotal/jasmine-py)
+Jasmine tests itself across many browsers (Safari, Chrome, Firefox, PhantomJS, and new Internet Explorer) as well as node. To see the exact version tests are run against look at our [.travis.yml](https://github.com/jasmine/jasmine/blob/master/.travis.yml)
 
 
-
 ## Support
@@ -60,3 +66,3 @@
 * [Rajan Agaskar](mailto:[e-mail]), Pivotal Labs
-* [Gregg Van Hove](mailto:[e-mail]), Pivotal Labs
+* [Gregg Van Hove](mailto:[e-mail]), Pivotal Labs
 
@@ -63,0 +69,0 @@ ### Maintainers Emeritus

RELEASE.md

@@ -18,8 +18,13 @@ # How to work on a Jasmine Release
 
-The current version lives in the file `/package.json`. This file should be set to the version that is _currently_ under development. That is, if version 1.0.0 is the current release then version should be incremented say, to 1.1.0.
+The current version lives in the file `/package.json`. This version will be the version number that is currently released. When releasing a new version, update `package.json` and `bower.json` with the new version and `grunt build:copyVersionToGem` to update the gem version number.
 
 This version is used by both `jasmine.js` and the `jasmine-core` Ruby gem.
 
-Note that Jasmine should *not* use the "patch" version number. Let downstream projects rev their patch versions as needed, keeping their major and minor version numbers in sync with Jasmine core.
+Note that Jasmine should only use the "patch" version number in the following cases:
 
+* Changes related to packaging for a specific platform (npm, gem, or pip).
+* Fixes for regressions.
+
+When jasmine-core revs its major or minor version, the binding libraries should also rev to that version.
+
 ## Release
@@ -65,3 +70,3 @@
 
-1. Visit the [Releases page for Jasmine](https://github.com/pivotal/jasmine/releases), find the tag just pushed.
+1. Visit the [Releases page for Jasmine](https://github.com/jasmine/jasmine/releases), find the tag just pushed.
  1. Paste in a link to the correct release notes for this release. The link should reference the blob and tag correctly, and the markdown file for the notes.
@@ -68,0 +73,0 @@ 1. If it is a pre-release, mark it as such.

New alerts

License Policy Violation

License

This package is not allowed per your license policy. Review the package's license to ensure compliance.

Found 1 instance in 1 package

Fixed alerts

License Policy Violation

License

This package is not allowed per your license policy. Review the package's license to ensure compliance.

Found 1 instance in 1 package

Improved metrics

Lines of code

3859

increased by4.24%

Number of lines in readme file

72

increased by9.09%

Worsened metrics

Total package byte prevSize

181406

decreased by-92.18%

Number of package files

30

decreased by-89.13%

No dependency changes