jasmine-core
Advanced tools
Comparing version 2.0.0 to 2.0.1
@@ -24,3 +24,3 @@ /* | ||
function getJasmineRequireObj() { | ||
if (typeof module !== "undefined" && module.exports) { | ||
if (typeof module !== 'undefined' && module.exports) { | ||
return exports; | ||
@@ -64,3 +64,3 @@ } else { | ||
pendingCount = 0; | ||
print("Started"); | ||
print('Started'); | ||
printNewline(); | ||
@@ -76,15 +76,20 @@ timer.start(); | ||
printNewline(); | ||
var specCounts = specCount + " " + plural("spec", specCount) + ", " + | ||
failureCount + " " + plural("failure", failureCount); | ||
if(specCount > 0) { | ||
printNewline(); | ||
if (pendingCount) { | ||
specCounts += ", " + pendingCount + " pending " + plural("spec", pendingCount); | ||
var specCounts = specCount + ' ' + plural('spec', specCount) + ', ' + | ||
failureCount + ' ' + plural('failure', failureCount); | ||
if (pendingCount) { | ||
specCounts += ', ' + pendingCount + ' pending ' + plural('spec', pendingCount); | ||
} | ||
print(specCounts); | ||
} else { | ||
print('No specs found'); | ||
} | ||
print(specCounts); | ||
printNewline(); | ||
var seconds = timer.elapsed() / 1000; | ||
print("Finished in " + seconds + " " + plural("second", seconds)); | ||
print('Finished in ' + seconds + ' ' + plural('second', seconds)); | ||
@@ -99,17 +104,17 @@ printNewline(); | ||
if (result.status == "pending") { | ||
if (result.status == 'pending') { | ||
pendingCount++; | ||
print(colored("yellow", "*")); | ||
print(colored('yellow', '*')); | ||
return; | ||
} | ||
if (result.status == "passed") { | ||
print(colored("green", '.')); | ||
if (result.status == 'passed') { | ||
print(colored('green', '.')); | ||
return; | ||
} | ||
if (result.status == "failed") { | ||
if (result.status == 'failed') { | ||
failureCount++; | ||
failedSpecs.push(result); | ||
print(colored("red", 'F')); | ||
print(colored('red', 'F')); | ||
} | ||
@@ -121,3 +126,3 @@ }; | ||
function printNewline() { | ||
print("\n"); | ||
print('\n'); | ||
} | ||
@@ -130,3 +135,3 @@ | ||
function plural(str, count) { | ||
return count == 1 ? str : str + "s"; | ||
return count == 1 ? str : str + 's'; | ||
} | ||
@@ -143,8 +148,8 @@ | ||
function indent(str, spaces) { | ||
var lines = (str || '').split("\n"); | ||
var lines = (str || '').split('\n'); | ||
var newArr = []; | ||
for (var i = 0; i < lines.length; i++) { | ||
newArr.push(repeat(" ", spaces).join("") + lines[i]); | ||
newArr.push(repeat(' ', spaces).join('') + lines[i]); | ||
} | ||
return newArr.join("\n"); | ||
return newArr.join('\n'); | ||
} | ||
@@ -151,0 +156,0 @@ |
{ | ||
"name": "jasmine-core", | ||
"license": "MIT", | ||
"version": "2.0.0", | ||
"version": "2.0.1", | ||
"repository": { | ||
@@ -11,6 +11,3 @@ "type": "git", | ||
"homepage": "http://jasmine.github.io", | ||
"files": [ | ||
"lib/console", | ||
"lib/jasmine-core" | ||
], | ||
"main": "./lib/jasmine-core.js", | ||
"devDependencies": { | ||
@@ -22,4 +19,7 @@ "grunt": "~0.4.1", | ||
"grunt-contrib-compress": "~0.5.2", | ||
"shelljs": "~0.1.4" | ||
"shelljs": "~0.1.4", | ||
"glob": "~3.2.9", | ||
"jasmine": "https://github.com/pivotal/jasmine-npm/archive/master.tar.gz", | ||
"load-grunt-tasks": "^0.4.0" | ||
} | ||
} |
@@ -1,4 +0,7 @@ | ||
<a name="README">[Jasmine](http://jasmine.github.io)</a> [![Build Status](https://travis-ci.org/pivotal/jasmine.png?branch=master)](https://travis-ci.org/pivotal/jasmine) [![Code Climate](https://codeclimate.com/repos/5269970a13d6374b6c01d632/badges/8bc25526da64e02065f4/gpa.png)](https://codeclimate.com/repos/5269970a13d6374b6c01d632/feed) | ||
<a name="README">[<img src="https://rawgithub.com/pivotal/jasmine/master/images/jasmine-horizontal.svg" width="400px" />](http://jasmine.github.io)</a> | ||
[![Build Status](https://travis-ci.org/pivotal/jasmine.png?branch=master)](https://travis-ci.org/pivotal/jasmine) [![Code Climate](https://codeclimate.com/github/pivotal/jasmine.png)](https://codeclimate.com/github/pivotal/jasmine) | ||
======= | ||
**A JavaScript Testing Framework** | ||
@@ -11,2 +14,4 @@ | ||
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). | ||
## Contributing | ||
@@ -16,2 +21,29 @@ | ||
## Installation | ||
To install Jasmine on your local box: | ||
* Clone Jasmine - `git clone https://github.com/pivotal/jasmine.git` | ||
* Create a Jasmine directory in your project - `mkdir my-project/jasmine` | ||
* Move latest dist to your project directory - `mv jasmine/dist/jasmine-standalone-2.0.0.zip my-project/jasmine` | ||
* Change directory - `cd my-project/jasmine` | ||
* Unzip the dist - `unzip jasmine-standalone-2.0.0.zip` | ||
Add the following to your HTML file: | ||
<link rel="shortcut icon" type="image/png" href="jasmine/lib/jasmine-2.0.0/jasmine_favicon.png"> | ||
<link rel="stylesheet" type="text/css" href="jasmine/lib/jasmine-2.0.0/jasmine.css"> | ||
<script type="text/javascript" src="jasmine/lib/jasmine-2.0.0/jasmine.js"></script> | ||
<script type="text/javascript" src="jasmine/lib/jasmine-2.0.0/jasmine-html.js"></script> | ||
<script type="text/javascript" src="jasmine/lib/jasmine-2.0.0/boot.js"></script> | ||
For the Jasmine Ruby Gem:<br> | ||
[https://github.com/pivotal/jasmine-gem](https://github.com/pivotal/jasmine-gem) | ||
For the Jasmine Python Egg:<br> | ||
[https://github.com/pivotal/jasmine-py](https://github.com/pivotal/jasmine-py) | ||
## Support | ||
@@ -34,2 +66,2 @@ | ||
Copyright (c) 2008-2013 Pivotal Labs. This software is licensed under the MIT License. | ||
Copyright (c) 2008-2014 Pivotal Labs. This software is licensed under the MIT License. |
Sorry, the diff of this file is too big to display
1709666
221
65
9
2793