diff --git a/lib/types/any.js b/lib/types/any.js deleted file mode 100644 index 8b2e3728798ff31d1d0d368a7041505ec1646f44..0000000000000000000000000000000000000000 Binary files a/lib/types/any.js and /dev/null differ diff --git a/lib/util/primitives.js b/lib/util/primitives.js index 789143b02797fb05db85c309cf3b32e160572f48..775a09a34cc7867e2063592e28b4d08aa95a5ec7 100644 Binary files a/lib/util/primitives.js and b/lib/util/primitives.js differ diff --git a/spec/core/primitives.json b/spec/core/primitives.json index d22cbaa2212afcb7c05b0061db9dca89b3c4e8fa..2001b8bd76054222dfc48c7847b2e2ad1484b5c0 100644 --- a/spec/core/primitives.json +++ b/spec/core/primitives.json @@ -57,13 +57,6 @@ }, "type": "string", "valid": true - }, - { - "description": "should generate any-value", - "schema": { - "type": "any" - }, - "type": "any" } ] } diff --git a/spec/helpers.coffee b/spec/helpers.coffee index aa3631ea04a12144d7c2eceb001e17f9d8e54239..3a6142bb21e896946c6463841e464617cc325f84 100644 --- a/spec/helpers.coffee +++ b/spec/helpers.coffee @@ -3,19 +3,8 @@ clone = require('clone') ZSchema = require('z-schema') JaySchema = require('jayschema') -type = (value) -> - Object::toString.call(value).match(/object (\w+)/)[1].toLowerCase() - -jasmine.Matchers::toHaveAnyType = -> - test = type(@actual) - - if ['array', 'boolean', 'null', 'number', 'object', 'string'].indexOf(test) is -1 - throw "Unexpected type '#{test}' to be any?" - - true - jasmine.Matchers::toHaveType = (expected) -> - if type(@actual) isnt expected + if Object::toString.call(@actual).match(/object (\w+)/)[1].toLowerCase() isnt expected throw "Expected #{JSON.stringify @actual} to have #{expected} type" true diff --git a/spec/main-spec.coffee b/spec/main-spec.coffee index df58ecca5da9eb8cb29111a9a9416bb700ddc1b3..f9565076d473ac1d772459ee5433a458746de655 100644 --- a/spec/main-spec.coffee +++ b/spec/main-spec.coffee @@ -29,10 +29,7 @@ glob.sync("#{__dirname}/**/*.json").forEach (file) -> throw e unless test.throws if test.type - if test.type is 'any' - expect(sample).toHaveAnyType() - else - expect(sample).toHaveType test.type + expect(sample).toHaveType test.type if test.valid expect(sample).toHaveSchema schema, refs