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

Merge branch 'FuzzySockets-to-throw-error-unused-param'

Browse Source
This commit is contained in:
Gregg Van Hove
2015-10-27 12:22:09 -07:00
parent 8e317d4026 25d73515f3
commit 018fd53c10
3 changed files with 10 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -3230,7 +3230,7 @@ getJasmineRequireObj().toThrow = function(j$) {
}; };
getJasmineRequireObj().toThrowError = function(j$) { getJasmineRequireObj().toThrowError = function(j$) {
function toThrowError (util) { function toThrowError () {
return { return {
compare: function(actual) { compare: function(actual) {
var threw = false, var threw = false,

16
spec/core/matchers/toThrowErrorSpec.js
View File

@@ -146,7 +146,7 @@ describe("toThrowError", function() {
var util = { var util = {
equals: jasmine.createSpy('delegated-equal').and.returnValue(true) equals: jasmine.createSpy('delegated-equal').and.returnValue(true)
}, },
matcher = j$.matchers.toThrowError(util), matcher = j$.matchers.toThrowError(),
fn = function() { fn = function() {
throw new Error(); throw new Error();
}, },
@@ -162,7 +162,7 @@ describe("toThrowError", function() {
var util = { var util = {
equals: jasmine.createSpy('delegated-equal').and.returnValue(true) equals: jasmine.createSpy('delegated-equal').and.returnValue(true)
}, },
matcher = j$.matchers.toThrowError(util), matcher = j$.matchers.toThrowError(),
CustomError = function CustomError(arg) { arg.x }, CustomError = function CustomError(arg) { arg.x },
fn = function() { fn = function() {
throw new CustomError({ x: 1 }); throw new CustomError({ x: 1 });
@@ -181,7 +181,7 @@ describe("toThrowError", function() {
var util = { var util = {
equals: jasmine.createSpy('delegated-equal').and.returnValue(false) equals: jasmine.createSpy('delegated-equal').and.returnValue(false)
}, },
matcher = j$.matchers.toThrowError(util), matcher = j$.matchers.toThrowError(),
fn = function() { fn = function() {
throw new Error(); throw new Error();
}, },
@@ -197,7 +197,7 @@ describe("toThrowError", function() {
var util = { var util = {
equals: jasmine.createSpy('delegated-equal').and.returnValue(true) equals: jasmine.createSpy('delegated-equal').and.returnValue(true)
}, },
matcher = j$.matchers.toThrowError(util), matcher = j$.matchers.toThrowError(),
fn = function() { fn = function() {
throw new TypeError("foo"); throw new TypeError("foo");
}, },
@@ -213,7 +213,7 @@ describe("toThrowError", function() {
var util = { var util = {
equals: jasmine.createSpy('delegated-equal').and.returnValue(true) equals: jasmine.createSpy('delegated-equal').and.returnValue(true)
}, },
matcher = j$.matchers.toThrowError(util), matcher = j$.matchers.toThrowError(),
CustomError = function CustomError(arg) { this.message = arg.message }, CustomError = function CustomError(arg) { this.message = arg.message },
fn = function() { fn = function() {
throw new CustomError({message: "foo"}); throw new CustomError({message: "foo"});
@@ -232,7 +232,7 @@ describe("toThrowError", function() {
var util = { var util = {
equals: jasmine.createSpy('delegated-equal').and.returnValue(false) equals: jasmine.createSpy('delegated-equal').and.returnValue(false)
}, },
matcher = j$.matchers.toThrowError(util), matcher = j$.matchers.toThrowError(),
fn = function() { fn = function() {
throw new TypeError("foo"); throw new TypeError("foo");
}, },
@@ -248,7 +248,7 @@ describe("toThrowError", function() {
var util = { var util = {
equals: jasmine.createSpy('delegated-equal').and.returnValue(true) equals: jasmine.createSpy('delegated-equal').and.returnValue(true)
}, },
matcher = j$.matchers.toThrowError(util), matcher = j$.matchers.toThrowError(),
fn = function() { fn = function() {
throw new TypeError("foo"); throw new TypeError("foo");
}, },
@@ -264,7 +264,7 @@ describe("toThrowError", function() {
var util = { var util = {
equals: jasmine.createSpy('delegated-equal').and.returnValue(false) equals: jasmine.createSpy('delegated-equal').and.returnValue(false)
}, },
matcher = j$.matchers.toThrowError(util), matcher = j$.matchers.toThrowError(),
fn = function() { fn = function() {
throw new TypeError("foo"); throw new TypeError("foo");
}, },

2
src/core/matchers/toThrowError.js
View File

@@ -1,5 +1,5 @@
getJasmineRequireObj().toThrowError = function(j$) { getJasmineRequireObj().toThrowError = function(j$) {
function toThrowError (util) { function toThrowError () {
return { return {
compare: function(actual) { compare: function(actual) {
var threw = false, var threw = false,