added 1.2 flag to compat tests

fehguy · fehguy · commit bb5549b7d2cc · 2015-02-11T21:25:22.000-08:00
diff --git a/lib/swagger-client.js b/lib/swagger-client.js
@@ -1,6 +1,6 @@
 /**
  * swagger-client - swagger.js is a javascript client for use with swaggering APIs.
- * @version v2.1.2-M1
+ * @version v2.1.3-M1
  * @link http://swagger.io
  * @license apache 2.0
  */
@@ -391,7 +391,6 @@ SwaggerClient.prototype.build = function(mock) {
       return obj;
     new SwaggerHttp().execute(obj);
   }
-
   return this;
 };
 
@@ -507,8 +506,11 @@ SwaggerClient.prototype.buildFromSpec = function(response) {
     }
   }
   this.isBuilt = true;
-  if (this.success)
+  if (this.success) {
+    this.isValid = true;
+    this.isBuilt = true;
     this.success();
+  }
   return this;
 };
 
@@ -1588,7 +1590,8 @@ SwaggerClient.prototype.buildFrom1_2Spec = function (response) {
 
 SwaggerClient.prototype.finish = function() {
   if (typeof this.success === 'function') {
-    console.log('success');
+    this.isValid = true;
+    this.isBuilt = true;
     this.selfReflect();
     this.success();
   }  
diff --git a/lib/swagger-client.min.js b/lib/swagger-client.min.js
diff --git a/src/js/swagger-a.js b/src/js/swagger-a.js
@@ -109,7 +109,6 @@ SwaggerClient.prototype.build = function(mock) {
       return obj;
     new SwaggerHttp().execute(obj);
   }
-
   return this;
 };
 
@@ -225,8 +224,11 @@ SwaggerClient.prototype.buildFromSpec = function(response) {
     }
   }
   this.isBuilt = true;
-  if (this.success)
+  if (this.success) {
+    this.isValid = true;
+    this.isBuilt = true;
     this.success();
+  }
   return this;
 };
 
diff --git a/src/js/swagger-compat.js b/src/js/swagger-compat.js
@@ -49,7 +49,8 @@ SwaggerClient.prototype.buildFrom1_2Spec = function (response) {
 
 SwaggerClient.prototype.finish = function() {
   if (typeof this.success === 'function') {
-    console.log('success');
+    this.isValid = true;
+    this.isBuilt = true;
     this.selfReflect();
     this.success();
   }  
diff --git a/test/compat/auth.js b/test/compat/auth.js
@@ -4,7 +4,7 @@ var mock = require('../../test/compat/mock');
 var swagger = require('../../lib/swagger-client');
 var sample, instance;
 
-describe('api key authorizations', function() {
+describe('1.2 api key authorizations', function() {
   before(function(done) {
     mock.petstore(done, function(petstore, server){
       sample = petstore;
diff --git a/test/compat/defaultCallbacks.js b/test/compat/defaultCallbacks.js
@@ -4,7 +4,7 @@ var mock = require('../../test/compat/mock');
 var swagger = require('../../lib/swagger-client');
 var sample, instance;
 
-describe('default success callback', function() {
+describe('1.2 default success callback', function() {
   var opts = {};
   var finished;
   opts.defaultSuccessCallback = function(data) {
diff --git a/test/compat/http.js b/test/compat/http.js
@@ -3,7 +3,7 @@ var expect = require('expect');
 var mock = require('../../test/compat/mock');
 var sample, instance;
 
-describe('http', function() {
+describe('1.2 http', function() {
   before(function(done) {
     mock.petstore(done, function(petstore, server){
       sample = petstore;
diff --git a/test/compat/macros.js b/test/compat/macros.js
@@ -3,7 +3,7 @@ var expect = require('expect');
 var mock = require('../../test/compat/mock');
 var sample, instance;
 
-describe('macro overrides', function() {
+describe('1.2 macro overrides', function() {
   before(function(done) {
     var macros = {
       parameter: function(operation, parameter) {
diff --git a/test/compat/modelSignatures.js b/test/compat/modelSignatures.js
@@ -3,7 +3,7 @@ var expect = require('expect');
 var mock = require('../../test/compat/mock');
 var sample, instance;
 
-describe('model signatures', function() {
+describe('1.2 model signatures', function() {
   before(function(done) {
     mock.petstore(done, function(petstore, server){
       sample = petstore;
diff --git a/test/compat/models.js b/test/compat/models.js
@@ -4,7 +4,7 @@ var mock = require('../../test/compat/mock');
 var swagger = require('../../lib/swagger-client');
 var sample, instance;
 
-describe('get model operations', function() {
+describe('1.2 get model operations', function() {
   before(function(done) {
     mock.petstore(done, function(petstore, server){
       sample = petstore;
diff --git a/test/compat/operation.js b/test/compat/operation.js
@@ -3,7 +3,7 @@ var expect = require('expect');
 var mock = require('../../test/compat/mock');
 var sample, instance;
 
-describe('verifies the nickname is sanitized', function() {
+describe('1.2 verifies the nickname is sanitized', function() {
   before(function(done) {
     mock.petstore(done, function(petstore, server){
       sample = petstore;
diff --git a/test/compat/request.js b/test/compat/request.js
@@ -4,7 +4,7 @@ var mock = require('../../test/compat/mock');
 var swagger = require('../../lib/swagger-client');
 var sample, instance;
 
-describe('request operations', function() {
+describe('1.2 request operations', function() {
   before(function(done) {
     mock.petstore(done, function(petstore, server){
       sample = petstore;
@@ -14,7 +14,6 @@ describe('request operations', function() {
 
   after(function(done){
     instance.close();
-
     done();
   });
 

Original file line number	Diff line number	Diff line change
`@@ -109,7 +109,6 @@ SwaggerClient.prototype.build = function(mock) {`
`109`	`109`	`return obj;`
`110`	`110`	`new SwaggerHttp().execute(obj);`
`111`	`111`	`}`
`112`		`-`
`113`	`112`	`return this;`
`114`	`113`	`};`
`115`	`114`
`@@ -225,8 +224,11 @@ SwaggerClient.prototype.buildFromSpec = function(response) {`
`225`	`224`	`}`
`226`	`225`	`}`
`227`	`226`	`this.isBuilt = true;`
`228`		`- if (this.success)`
	`227`	`+ if (this.success) {`
	`228`	`+ this.isValid = true;`
	`229`	`+ this.isBuilt = true;`
`229`	`230`	`this.success();`
	`231`	`+ }`
`230`	`232`	`return this;`
`231`	`233`	`};`
`232`	`234`
Original file line number	Diff line number	Diff line change
`@@ -49,7 +49,8 @@ SwaggerClient.prototype.buildFrom1_2Spec = function (response) {`
`49`	`49`
`50`	`50`	`SwaggerClient.prototype.finish = function() {`
`51`	`51`	`if (typeof this.success === 'function') {`
`52`		`- console.log('success');`
	`52`	`+ this.isValid = true;`
	`53`	`+ this.isBuilt = true;`
`53`	`54`	`this.selfReflect();`
`54`	`55`	`this.success();`
`55`	`56`	`}`