From aa858c742a6ac3e2d169e0b8d7b3373bc39afa04 Mon Sep 17 00:00:00 2001
From: Alvaro Cabrera <pateketrueke@gmail.com>
Date: Thu, 27 Nov 2014 14:37:51 -0600
Subject: [PATCH] Type any is not supported; fix
---
lib/types/any.js | Bin 311 -> 0 bytes
lib/util/primitives.js | Bin 332 -> 300 bytes
spec/core/primitives.json | 7 -------
spec/helpers.coffee | 13 +------------
spec/main-spec.coffee | 5 +----
5 files changed, 2 insertions(+), 23 deletions(-)
delete mode 100644 lib/types/any.js
diff --git a/lib/types/any.js b/lib/types/any.js
deleted file mode 100644
index 8b2e3728798ff31d1d0d368a7041505ec1646f44..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001
literal 311
zcmY!{ElyP^E-A`PE>XAU;wnolQYfh`NG(>dRftwkEGkN@RM$~ZPs-2FNlnZHG4o1u
zav*eWQfd*1m6=zPnhs&+CuOB3mw*I8M&_lf$3o34O3X{i&sDHhC`v6X%`8gQP}kGb
zFD=Q;(TB*WYg%)0<>sf9=A`PSRutqHm4IB3R+^Vwl9`{UQI?ofnyRT#&846Ka$!MH
zW^QIlW*OL-7$zcQ!KOmAWT#dt*h0J(4Y5+gKnKFt%Sp{kFUe5QRWQ^9xmQ7<D7B=t
VC{F=lP;_=`Wh~Sc)?BsLTma14W>^3K
diff --git a/lib/util/primitives.js b/lib/util/primitives.js
index 789143b02797fb05db85c309cf3b32e160572f48..775a09a34cc7867e2063592e28b4d08aa95a5ec7 100644
GIT binary patch
delta 12
TcmX@Zw1#Pe1|thstu+?_8BGHw
delta 44
zcmZ3(bcShz2BV4&mx4lKUZs^nQEFjnW>Kn!x}KhXNo7H5v3_D+rMf0ptu+?_EF=vv
diff --git a/spec/core/primitives.json b/spec/core/primitives.json
index d22cbaa2..2001b8bd 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 aa3631ea..3a6142bb 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 df58ecca..f9565076 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
--
GitLab