diff --git a/modules/swagger-codegen/src/main/resources/Javascript/package.mustache b/modules/swagger-codegen/src/main/resources/Javascript/package.mustache
index e86b1a17aee4..53bbed30be93 100644
--- a/modules/swagger-codegen/src/main/resources/Javascript/package.mustache
+++ b/modules/swagger-codegen/src/main/resources/Javascript/package.mustache
@@ -12,6 +12,7 @@
},
"devDependencies": {
"mocha": "~2.3.4",
+ "expect.js": "~0.3.1",
"mockrequire": "~0.0.5",
"domino": "~1.0.20",
"xmlhttprequest": "~1.8.0"
diff --git a/samples/client/petstore/javascript/package.json b/samples/client/petstore/javascript/package.json
index a7bc83e4ae2c..156300cf760f 100644
--- a/samples/client/petstore/javascript/package.json
+++ b/samples/client/petstore/javascript/package.json
@@ -12,6 +12,7 @@
},
"devDependencies": {
"mocha": "~2.3.4",
+ "expect.js": "~0.3.1",
"mockrequire": "~0.0.5",
"domino": "~1.0.20",
"xmlhttprequest": "~1.8.0"
diff --git a/samples/client/petstore/javascript/test/helper.js b/samples/client/petstore/javascript/test/helper.js
new file mode 100644
index 000000000000..a1b798f325f4
--- /dev/null
+++ b/samples/client/petstore/javascript/test/helper.js
@@ -0,0 +1,19 @@
+var mockrequire = require('mockrequire');
+
+var jquery = require('jquery');
+var domino = require('domino');
+var XMLHttpRequest = require('xmlhttprequest').XMLHttpRequest;
+var window = domino.createWindow();
+var $ = jquery(window);
+$.support.cors = true;
+$.ajaxSettings.xhr = function() {
+ return new XMLHttpRequest();
+};
+
+var requireWithMocks = function(path) {
+ return mockrequire(path, {
+ 'jquery': $
+ });
+};
+
+exports.requireWithMocks = requireWithMocks;
diff --git a/samples/client/petstore/javascript/test/run_tests.html b/samples/client/petstore/javascript/test/run_tests.html
new file mode 100644
index 000000000000..9f2d78ad0b86
--- /dev/null
+++ b/samples/client/petstore/javascript/test/run_tests.html
@@ -0,0 +1,33 @@
+
+
+
+ Mocha Tests
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/samples/client/petstore/javascript/test/test.js b/samples/client/petstore/javascript/test/test.js
index 8b4f3953e6d4..3c437d0cd5a5 100644
--- a/samples/client/petstore/javascript/test/test.js
+++ b/samples/client/petstore/javascript/test/test.js
@@ -1,27 +1,16 @@
-var assert = require('assert');
-var mockrequire = require('mockrequire');
-
-var jquery = require('jquery');
-var domino = require('domino');
-var XMLHttpRequest = require('xmlhttprequest').XMLHttpRequest;
-var window = domino.createWindow();
-var $ = jquery(window);
-$.support.cors = true;
-$.ajaxSettings.xhr = function() {
- return new XMLHttpRequest();
-};
-
-var PetApi = mockrequire('../src/api/PetApi', {
- 'jquery': $
-});
+if (typeof module === 'object' && module.exports) {
+ var expect = require('expect.js');
+ var requireWithMocks = require('./helper.js').requireWithMocks;
+ var PetApi = requireWithMocks('../src/api/PetApi');
+}
describe('PetApi', function() {
describe('#getPetById', function () {
it('should work', function (done) {
var api = new PetApi();
api.getPetById(1, function(pet, textStatus, jqXHR) {
- assert.equal('success', textStatus);
- assert.equal(1, pet.id);
+ expect(textStatus).to.be('success');
+ expect(pet.id).to.be(1);
done();
});
});