admin/jasmine
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge pull request #1162 from amavisca/update-dev-dependencies

Browse Source 
Update devDependencies and fix issues from this
This commit is contained in:
Greg Cobb
2016-07-20 20:18:57 -07:00
committed by GitHub
parent 99aa2247b6 15f92b226c
commit 7f7dda7a2c
5 changed files with 1124 additions and 1124 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
lib/jasmine-core/jasmine-html.js
View File

@@ -241,7 +241,7 @@ jasmineRequire.HtmlReporter = function(j$) {
var errorBarClassName = 'jasmine-bar jasmine-errored'; var errorBarClassName = 'jasmine-bar jasmine-errored';
var errorBarMessagePrefix = 'AfterAll '; var errorBarMessagePrefix = 'AfterAll ';
for(i = 0; i < failedSuites.length; i++) { for(var i = 0; i < failedSuites.length; i++) {
var failedSuite = failedSuites[i]; var failedSuite = failedSuites[i];
for(var j = 0; j < failedSuite.failedExpectations.length; j++) { for(var j = 0; j < failedSuite.failedExpectations.length; j++) {
alert.appendChild(createDom('span', {className: errorBarClassName}, errorBarMessagePrefix + failedSuite.failedExpectations[j].message)); alert.appendChild(createDom('span', {className: errorBarClassName}, errorBarMessagePrefix + failedSuite.failedExpectations[j].message));
@@ -317,7 +317,7 @@ jasmineRequire.HtmlReporter = function(j$) {
setMenuModeTo('jasmine-failure-list'); setMenuModeTo('jasmine-failure-list');
var failureNode = find('.jasmine-failures'); var failureNode = find('.jasmine-failures');
for (var i = 0; i < failures.length; i++) { for (i = 0; i < failures.length; i++) {
failureNode.appendChild(failures[i]); failureNode.appendChild(failures[i]);
} }
} }

2216
lib/jasmine-core/jasmine.js
View File

File diff suppressed because it is too large Load Diff

20
package.json
View File

@@ -13,22 +13,22 @@
"bdd" "bdd"
], ],
"scripts": { "scripts": {
"test": "./node_modules/.bin/grunt jshint execSpecsInNode" "test": "grunt jshint execSpecsInNode"
}, },
"description": "Official packaging of Jasmine's core files for use by Node.js projects.", "description": "Official packaging of Jasmine's core files for use by Node.js projects.",
"homepage": "http://jasmine.github.io", "homepage": "http://jasmine.github.io",
"main": "./lib/jasmine-core.js", "main": "./lib/jasmine-core.js",
"devDependencies": { "devDependencies": {
"glob": "~5.0.13", "glob": "~7.0.5",
"grunt": "~0.4.1", "grunt": "^1.0.1",
"grunt-cli": "^0.1.13", "grunt-cli": "^1.2.0",
"grunt-contrib-compass": "~0.6.0", "grunt-contrib-compass": "^1.1.1",
"grunt-contrib-compress": "~0.5.2", "grunt-contrib-compress": "^1.3.0",
"grunt-contrib-concat": "~0.3.0", "grunt-contrib-concat": "^1.0.1",
"grunt-contrib-jshint": "~0.7.0", "grunt-contrib-jshint": "^1.0.0",
"jasmine": "git://github.com/jasmine/jasmine-npm.git", "jasmine": "^2.4.0",
"load-grunt-tasks": "^0.4.0", "load-grunt-tasks": "^0.4.0",
"shelljs": "~0.1.4", "shelljs": "^0.7.0",
"temp": "~0.8.1" "temp": "~0.8.1"
} }
} }

4
spec/npmPackage/npmPackageSpec.js
View File

@@ -5,9 +5,9 @@ describe('npm package', function() {
beforeAll(function() { beforeAll(function() {
var shell = require('shelljs'), var shell = require('shelljs'),
pack = shell.exec('npm pack', { silent: true }); pack = shell.exec('npm pack', { silent: true});
this.tarball = pack.output.split('\n')[0]; this.tarball = pack.stdout.split('\n')[0];
this.tmpDir = temp.mkdirSync(); // automatically deleted on exit this.tmpDir = temp.mkdirSync(); // automatically deleted on exit
var untar = shell.exec('tar -xzf ' + this.tarball + ' -C ' + this.tmpDir, { silent: true }); var untar = shell.exec('tar -xzf ' + this.tarball + ' -C ' + this.tmpDir, { silent: true });

4
src/html/HtmlReporter.js
View File

@@ -212,7 +212,7 @@ jasmineRequire.HtmlReporter = function(j$) {
var errorBarClassName = 'jasmine-bar jasmine-errored'; var errorBarClassName = 'jasmine-bar jasmine-errored';
var errorBarMessagePrefix = 'AfterAll '; var errorBarMessagePrefix = 'AfterAll ';
for(i = 0; i < failedSuites.length; i++) { for(var i = 0; i < failedSuites.length; i++) {
var failedSuite = failedSuites[i]; var failedSuite = failedSuites[i];
for(var j = 0; j < failedSuite.failedExpectations.length; j++) { for(var j = 0; j < failedSuite.failedExpectations.length; j++) {
alert.appendChild(createDom('span', {className: errorBarClassName}, errorBarMessagePrefix + failedSuite.failedExpectations[j].message)); alert.appendChild(createDom('span', {className: errorBarClassName}, errorBarMessagePrefix + failedSuite.failedExpectations[j].message));
@@ -288,7 +288,7 @@ jasmineRequire.HtmlReporter = function(j$) {
setMenuModeTo('jasmine-failure-list'); setMenuModeTo('jasmine-failure-list');
var failureNode = find('.jasmine-failures'); var failureNode = find('.jasmine-failures');
for (var i = 0; i < failures.length; i++) { for (i = 0; i < failures.length; i++) {
failureNode.appendChild(failures[i]); failureNode.appendChild(failures[i]);
} }
} }