remove double "if" condition

apiaryio · Mar 20, 2015 · f5878ec · f5878ec
1 parent a21faf5
commit f5878ec
Showing 1 changed file with 17 additions and 18 deletions.
diff --git a/src/mixins/validatable-http-message.coffee b/src/mixins/validatable-http-message.coffee
@@ -159,28 +159,27 @@ class Validatable
     @validation.body.expectedType = null
     @validation.body.results ?= []
 
-    if @expected.bodySchema? and
-      @expected.bodySchema?
-        if typeof @expected.bodySchema == 'string'
-          try
-            parsed = JSON.parse @expected.bodySchema
-            if typeof parsed != 'object' or Array.isArray parsed
-              message = {
-                message: 'Expected body: JSON Schema provided, but it is not an Object'
-                severity: 'error'
-              }
-              @validation.body.results.push message
-            else
-              @validation.body.expectedType = 'application/schema+json'
-          catch error
+    if @expected.bodySchema?
+      if typeof @expected.bodySchema == 'string'
+        try
+          parsed = JSON.parse @expected.bodySchema
+          if typeof parsed != 'object' or Array.isArray parsed
             message = {
-              message: 'Expected body: JSON Schema provided, but it is not a parseable JSON'
+              message: 'Expected body: JSON Schema provided, but it is not an Object'
               severity: 'error'
             }
             @validation.body.results.push message
-            return
-        else
-          @validation.body.expectedType = 'application/schema+json'
+          else
+            @validation.body.expectedType = 'application/schema+json'
+        catch error
+          message = {
+            message: 'Expected body: JSON Schema provided, but it is not a parseable JSON'
+            severity: 'error'
+          }
+          @validation.body.results.push message
+          return
+      else
+        @validation.body.expectedType = 'application/schema+json'
     else
 
       expectedContentType = @expected.headers?['content-type']