diff --git a/package-lock.json b/package-lock.json index 1e1eca8..7f08f4c 100644 --- a/package-lock.json +++ b/package-lock.json @@ -12,7 +12,6 @@ "async": "3.2.3", "dedent": "^0.6.0", "highlight-es": "^1.0.0", - "is-jquery-obj": "^0.1.0", "lodash": "^4.14.0", "moment": "^2.14.1", "mustache": "^2.2.1", @@ -3899,11 +3898,6 @@ "node": ">=0.10.0" } }, - "node_modules/is-jquery-obj": { - "version": "0.1.1", - "resolved": "https://registry.npmjs.org/is-jquery-obj/-/is-jquery-obj-0.1.1.tgz", - "integrity": "sha512-18toSebUVF7y717dgw/Dzn6djOCqrkiDp3MhB8P6TdKyCVkbD1ZwE7Uz8Hwx6hUPTvKjbyYH9ncXT4ts4qLaSA==" - }, "node_modules/is-negated-glob": { "version": "1.0.0", "resolved": "https://registry.npmjs.org/is-negated-glob/-/is-negated-glob-1.0.0.tgz", @@ -11919,11 +11913,6 @@ "is-extglob": "^2.1.1" } }, - "is-jquery-obj": { - "version": "0.1.1", - "resolved": "https://registry.npmjs.org/is-jquery-obj/-/is-jquery-obj-0.1.1.tgz", - "integrity": "sha512-18toSebUVF7y717dgw/Dzn6djOCqrkiDp3MhB8P6TdKyCVkbD1ZwE7Uz8Hwx6hUPTvKjbyYH9ncXT4ts4qLaSA==" - }, "is-negated-glob": { "version": "1.0.0", "resolved": "https://registry.npmjs.org/is-negated-glob/-/is-negated-glob-1.0.0.tgz", diff --git a/package.json b/package.json index 46baf51..1a3b0ce 100644 --- a/package.json +++ b/package.json @@ -48,7 +48,6 @@ "async": "3.2.3", "dedent": "^0.6.0", "highlight-es": "^1.0.0", - "is-jquery-obj": "^0.1.0", "lodash": "^4.14.0", "moment": "^2.14.1", "mustache": "^2.2.1", diff --git a/src/client/api/actions/actions.js b/src/client/api/actions/actions.js index 0d70459..ea7e669 100644 --- a/src/client/api/actions/actions.js +++ b/src/client/api/actions/actions.js @@ -16,7 +16,7 @@ import * as sourceIndexTracker from '../../source-index'; import forEachSeries from '../../deps/for-each-series'; import * as sandboxedJQuery from '../../sandboxed-jquery'; import ERROR_TYPE from '../../../test-run-error/type'; -import isJQueryObj from 'is-jquery-obj'; +import isJQueryObj from '../../../utils/is-jquery-obj'; var nativeMethods = hammerhead.nativeMethods; diff --git a/src/client/api/assertions.js b/src/client/api/assertions.js index c18a491..7354e94 100644 --- a/src/client/api/assertions.js +++ b/src/client/api/assertions.js @@ -4,7 +4,7 @@ import * as sourceIndexTracker from '../source-index'; import SETTINGS from '../settings'; import CROSS_DOMAIN_MESSAGES from '../cross-domain-messages'; import ERROR_TYPE from '../../test-run-error/type'; -import isJQueryObj from 'is-jquery-obj'; +import isJQueryObj from '../../utils/is-jquery-obj'; var messageSandbox = hammerhead.eventSandbox.message; diff --git a/src/client/runner-base.js b/src/client/runner-base.js index ede14f2..57c58f7 100644 --- a/src/client/runner-base.js +++ b/src/client/runner-base.js @@ -12,7 +12,7 @@ import COMMAND from '../test-run/command'; import ERROR_TYPE from '../test-run-error/type'; import * as sandboxedJQuery from './sandboxed-jquery'; import * as transport from './transport'; -import isJQueryObj from 'is-jquery-obj'; +import isJQueryObj from '../utils/is-jquery-obj'; var messageSandbox = hammerhead.eventSandbox.message; var nativeMethods = hammerhead.nativeMethods; diff --git a/src/utils/is-jquery-obj.js b/src/utils/is-jquery-obj.js new file mode 100644 index 0000000..c858d32 --- /dev/null +++ b/src/utils/is-jquery-obj.js @@ -0,0 +1,3 @@ +export default function (obj) { + return !!(obj && obj.jquery); +} diff --git a/test/server/is-jquery-obj-test.js b/test/server/is-jquery-obj-test.js new file mode 100644 index 0000000..a28b4a7 --- /dev/null +++ b/test/server/is-jquery-obj-test.js @@ -0,0 +1,10 @@ +const assert = require('assert'); +const isjQueryObj = require('../../lib/utils/is-jquery-obj').default; + +describe('is-jquery-obj test', () => { + it('Should define jquery object correctly', () => { + assert.equal(isjQueryObj(void 0), false); + assert.equal(isjQueryObj({}), false); + assert.equal(isjQueryObj({ jquery: {} }), true); + }); +});