From 09d2ce9bc9ab2813f017f375fd108260044c6a89 Mon Sep 17 00:00:00 2001 From: Steve Gravrock Date: Tue, 27 Jul 2021 17:53:09 -0700 Subject: [PATCH] Removed more code that supported browsers we no longer run on --- lib/jasmine-core/jasmine.js | 14 +------------- spec/core/PrettyPrintSpec.js | 16 +++++++--------- .../asymmetric_equality/ObjectContainingSpec.js | 11 +---------- src/core/asymmetric_equality/ObjectContaining.js | 14 +------------- 4 files changed, 10 insertions(+), 45 deletions(-) diff --git a/lib/jasmine-core/jasmine.js b/lib/jasmine-core/jasmine.js index 6870c59b..088972b7 100644 --- a/lib/jasmine-core/jasmine.js +++ b/lib/jasmine-core/jasmine.js @@ -2577,18 +2577,6 @@ getJasmineRequireObj().ObjectContaining = function(j$) { this.sample = sample; } - function getPrototype(obj) { - if (Object.getPrototypeOf) { - return Object.getPrototypeOf(obj); - } - - if (obj.constructor.prototype == obj) { - return null; - } - - return obj.constructor.prototype; - } - function hasProperty(obj, property) { if (!obj || typeof obj !== 'object') { return false; @@ -2598,7 +2586,7 @@ getJasmineRequireObj().ObjectContaining = function(j$) { return true; } - return hasProperty(getPrototype(obj), property); + return hasProperty(Object.getPrototypeOf(obj), property); } ObjectContaining.prototype.asymmetricMatch = function(other, matchersUtil) { diff --git a/spec/core/PrettyPrintSpec.js b/spec/core/PrettyPrintSpec.js index 2fa0a74d..ed239191 100644 --- a/spec/core/PrettyPrintSpec.js +++ b/spec/core/PrettyPrintSpec.js @@ -268,15 +268,13 @@ describe('PrettyPrinter', function() { }); it('should stringify immutable circular objects', function() { - if (Object.freeze) { - var pp = jasmineUnderTest.makePrettyPrinter(); - var frozenObject = { foo: { bar: 'baz' } }; - frozenObject.circular = frozenObject; - frozenObject = Object.freeze(frozenObject); - expect(pp(frozenObject)).toEqual( - "Object({ foo: Object({ bar: 'baz' }), circular: })" - ); - } + var pp = jasmineUnderTest.makePrettyPrinter(); + var frozenObject = { foo: { bar: 'baz' } }; + frozenObject.circular = frozenObject; + frozenObject = Object.freeze(frozenObject); + expect(pp(frozenObject)).toEqual( + "Object({ foo: Object({ bar: 'baz' }), circular: })" + ); }); it('should stringify RegExp objects properly', function() { diff --git a/spec/core/asymmetric_equality/ObjectContainingSpec.js b/spec/core/asymmetric_equality/ObjectContainingSpec.js index 07b86148..07772047 100644 --- a/spec/core/asymmetric_equality/ObjectContainingSpec.js +++ b/spec/core/asymmetric_equality/ObjectContainingSpec.js @@ -110,16 +110,7 @@ describe('ObjectContaining', function() { var matchersUtil = new jasmineUnderTest.MatchersUtil(); var prototypeObject = { foo: 'fooVal' }; - var obj; - - if (Object.create) { - obj = Object.create(prototypeObject); - } else { - function Foo() {} - Foo.prototype = prototypeObject; - Foo.prototype.constructor = Foo; - obj = new Foo(); - } + var obj = Object.create(prototypeObject); expect(containing.asymmetricMatch(obj, matchersUtil)).toBe(true); }); diff --git a/src/core/asymmetric_equality/ObjectContaining.js b/src/core/asymmetric_equality/ObjectContaining.js index 5e473033..249716c7 100644 --- a/src/core/asymmetric_equality/ObjectContaining.js +++ b/src/core/asymmetric_equality/ObjectContaining.js @@ -3,18 +3,6 @@ getJasmineRequireObj().ObjectContaining = function(j$) { this.sample = sample; } - function getPrototype(obj) { - if (Object.getPrototypeOf) { - return Object.getPrototypeOf(obj); - } - - if (obj.constructor.prototype == obj) { - return null; - } - - return obj.constructor.prototype; - } - function hasProperty(obj, property) { if (!obj || typeof obj !== 'object') { return false; @@ -24,7 +12,7 @@ getJasmineRequireObj().ObjectContaining = function(j$) { return true; } - return hasProperty(getPrototype(obj), property); + return hasProperty(Object.getPrototypeOf(obj), property); } ObjectContaining.prototype.asymmetricMatch = function(other, matchersUtil) {