Skip to content

Commit

Permalink
drop support for too old before-1.0.0 versions
Browse files Browse the repository at this point in the history
  • Loading branch information
twada committed Dec 9, 2014
1 parent 0aae502 commit ad98b26
Show file tree
Hide file tree
Showing 3 changed files with 5 additions and 18 deletions.
7 changes: 0 additions & 7 deletions test/expected/expected_output.js
Original file line number Diff line number Diff line change
Expand Up @@ -5,9 +5,6 @@ var argv = require('optimist').argv,
fs = require('fs'),
path = require('path'),
semver = require('semver'),
before_1_0_0 = function () {
return !(semver.valid(qunitVersion) || ['stable', 'head'].some(function(v){ return v === qunitVersion; }));
},
printContent = function (filename) {
var content = fs.readFileSync(path.resolve(path.join(__dirname, '..', 'expected', filename)), 'utf8');
util.print(content);
Expand All @@ -17,10 +14,6 @@ if (qunitVersion === 'stable') {
printContent('latest_format.txt');
} else if (qunitVersion === 'head') {
printContent('latest_format.txt');
} else if (qunitVersion === '001_two_args') {
printContent('001_format.txt');
} else if (before_1_0_0()) {
printContent('output_before_1_0_0.txt');
} else if (semver.lt(qunitVersion, '1.4.0')) {
printContent('output_before_1_4_0.txt');
} else if (semver.lt(qunitVersion, '1.10.0')) {
Expand Down
9 changes: 3 additions & 6 deletions test/node/test_compat.js
Original file line number Diff line number Diff line change
Expand Up @@ -7,20 +7,17 @@ var argv = require('optimist').argv,
slice = Array.prototype.slice,
QUnit,
tap,
before_1_0_0 = function () {
return !(semver.valid(qunitVersion) || ['stable', 'head'].some(function(v){ return v === qunitVersion; }));
},
starter = function () {};

// require QUnit (in two ways)
if (before_1_0_0() || semver.lt(qunitVersion, '1.3.0')) {
if (semver.lt(qunitVersion, '1.3.0')) {
QUnit = require(qunitPath).QUnit;
} else {
QUnit = require(qunitPath);
}

tap = qunitTap(QUnit, util.puts, {showSourceOnFailure: false});
if (before_1_0_0() || semver.lt(qunitVersion, '1.12.0')) {
if (semver.lt(qunitVersion, '1.12.0')) {
QUnit.init();
if (QUnit.config !== undefined) {
QUnit.config.updateRate = 0;
Expand All @@ -33,7 +30,7 @@ if (before_1_0_0() || semver.lt(qunitVersion, '1.12.0')) {
}

// starter function (required before 1.3.0)
if (before_1_0_0() || semver.lt(qunitVersion, '1.3.0')) {
if (semver.lt(qunitVersion, '1.3.0')) {
starter = function () {
QUnit.start();
};
Expand Down
7 changes: 2 additions & 5 deletions test/rhino/test_compat_rhino.js
Original file line number Diff line number Diff line change
Expand Up @@ -8,9 +8,6 @@ loadFile('sample/js/lib/math.js');
loadFile('sample/js/lib/incr.js');

loadFile('node_modules/semver/semver.js');
var before_1_0_0 = function () {
return !(semver.valid(qunitVersion) || ['stable', 'head'].some(function(v){ return v === qunitVersion; }));
};

loadFile('test/compatibility/' + qunitVersion + '/qunit.js');
loadFile('lib/qunit-tap.js');
Expand All @@ -33,7 +30,7 @@ var tap = qunitTap(QUnit, print, {
})();


if (before_1_0_0() || semver.lt(qunitVersion, '1.12.0')) {
if (semver.lt(qunitVersion, '1.12.0')) {
QUnit.init();
if (QUnit.config !== undefined) {
QUnit.config.updateRate = 0;
Expand All @@ -47,7 +44,7 @@ if (before_1_0_0() || semver.lt(qunitVersion, '1.12.0')) {

loadFile('test/suite.js');

if (before_1_0_0() || semver.lt(qunitVersion, '1.11.0')) {
if (semver.lt(qunitVersion, '1.11.0')) {
QUnit.start();
} else if (semver.gte(qunitVersion, '1.13.0')) {
QUnit.load();
Expand Down

0 comments on commit ad98b26

Please sign in to comment.