Merge branch 'master' of github.com:swagger-api/swagger-js

Author: fehguy

browser/swagger-client.js

@@ -40,6 +40,11 @@ SwaggerHttp.prototype.execute = function (obj, opts) {
       hasJQuery = true;
     }
   }
+  // OPTIONS support
+  if(obj.method.toLowerCase() === 'OPTIONS' && typeof client === 'SuperagentHttpClient') {
+    log('forcing jQuery as OPTIONS are not supported by SuperAgent');
+    obj.useJQuery = true;
+  }
   if(this.isInternetExplorer() && (obj.useJQuery === false || !hasJQuery )) {
     throw new Error('Unsupported configuration! JQuery is required but not available');
   }

browser/swagger-client.min.js

@@ -305,6 +305,42 @@ describe('SwaggerClient', function () {
     });
   });
 
+  it('should force jQuery for options', function(done) {
+    var spec = {
+      swagger: '2.0',
+      info: {
+        description: 'This is a sample server Petstore server',
+        version: '1.0.0',
+        title: 'Swagger Petstore'
+      },
+      host: 'petstore.swagger.io',
+      basePath: '/v2',
+      paths: {
+        '/pet': {
+          options: {
+            tags: [ 'pet' ],
+            operationId: 'testOptions',
+            responses: {
+              200: {
+                description: 'OK'
+              }
+            }
+          }
+        }
+      }
+    };
+
+    var client = new SwaggerClient({
+      spec: spec,
+      success: function () {
+        var result = client.pet.testOptions({}, function (data) {
+          expect(data.method).toEqual('OPTIONS');
+          done();
+        });
+      }
+    });
+  });
+
   it('should should use a custom http client', function(done) {
     var myHttpClient = {
       execute: function(obj) {