From 66544a87ca4dc23f109bc9d858b5ef10acad4f93 Mon Sep 17 00:00:00 2001 From: Anna Bodnia Date: Tue, 5 Jan 2016 15:55:40 +0200 Subject: [PATCH] Moved tests into v2 folder, added helper to run spec with the same name as test filename --- test/e2e/helpers.js | 10 ++++++++++ test/e2e/{v2.js => v2/petstore.js} | 9 ++++++--- 2 files changed, 16 insertions(+), 3 deletions(-) create mode 100644 test/e2e/helpers.js rename test/e2e/{v2.js => v2/petstore.js} (94%) diff --git a/test/e2e/helpers.js b/test/e2e/helpers.js new file mode 100644 index 00000000..c9d89475 --- /dev/null +++ b/test/e2e/helpers.js @@ -0,0 +1,10 @@ +'use strict'; + +var path = require('path'); +var SPEC_FILE_EXT = '.json'; + +module.exports.parseSpecFilename = function (name) { + var filename = path.parse(name); + var foldername = filename.dir.split(path.sep).splice(-1)[0]; + return [path.sep, foldername, path.sep, filename.name, SPEC_FILE_EXT].join(''); +}; diff --git a/test/e2e/v2.js b/test/e2e/v2/petstore.js similarity index 94% rename from test/e2e/v2.js rename to test/e2e/v2/petstore.js index 67eae3e0..0dfaa967 100644 --- a/test/e2e/v2.js +++ b/test/e2e/v2/petstore.js @@ -2,9 +2,10 @@ var expect = require('chai').expect; var webdriver = require('selenium-webdriver'); -var driver = require('./driver'); -var servers = require('./servers'); +var driver = require('../driver'); +var servers = require('../servers'); var until = webdriver.until; +var helpers = require('../helpers'); var elements = [ 'swagger-ui-container', @@ -16,12 +17,14 @@ var elements = [ 'header' ]; +var specPath = helpers.parseSpecFilename(__filename); + describe('swagger 2.0 spec tests', function () { this.timeout(40 * 1000); before(function (done) { this.timeout(50 * 1000); - servers.start('/v2/petstore.json', done); + servers.start(specPath, done); }); afterEach(function(){