From 39ffbc52d0b496d570d64c547ce8ef6b16955c86 Mon Sep 17 00:00:00 2001 From: Sergio Crisostomo Date: Mon, 10 Aug 2015 16:21:32 +0200 Subject: [PATCH] DRY server build settings, remove unused dependencies --- Specs/Core/Core.js | 3 ++- Tests/gruntfile-options.js | 7 ++++--- package.json | 4 +--- 3 files changed, 7 insertions(+), 7 deletions(-) diff --git a/Specs/Core/Core.js b/Specs/Core/Core.js index b7e7e06d..a3900e48 100644 --- a/Specs/Core/Core.js +++ b/Specs/Core/Core.js @@ -610,7 +610,8 @@ describe('instanceOf', function(){ }); // todo(ibolmo) - if (typeof window != 'undefined' && window.Element && Element.set) it("should return true for Element instances", function(){ + var dit = typeof window != 'undefined' && window.Element && Element.set ? it : xit; + dit("should return true for Element instances", function(){ expect(instanceOf(new Element('div'), Element)).toBeTruthy(); }); diff --git a/Tests/gruntfile-options.js b/Tests/gruntfile-options.js index 4498d107..de4d6b27 100644 --- a/Tests/gruntfile-options.js +++ b/Tests/gruntfile-options.js @@ -6,10 +6,11 @@ var ymlPackage = YAML.safeLoad(fs.readFileSync('package.yml', 'utf8')); var travisBuild = process.env.BUILD; var travisBrowser = process.env.BROWSER; var sauceBrowsers = JSON.parse(fs.readFileSync('Tests/browsers.json')); +var serverBuildOptions = JSON.parse(fs.readFileSync('Tests/dist-tasks.json')).build.server.options; var serverBuild = { - modules: ['Core/Core', 'Core/Array', 'Core/String', 'Core/Number', 'Core/Function', 'Core/Object', 'Core/Class', 'Core/Class.Extras', 'Core/JSON'], + modules: serverBuildOptions.only, specFiles: ['Specs/Core/*.js', 'Specs/Core/*.js', 'Specs/Core/*.js', 'Specs/Core/*.js', 'Specs/Core/*.js'], - strip: ['1.2compat', '1.3compat', '1.4compat', '*compat', 'IE', 'ltIE8', 'ltIE9', '!ES5', '!ES5-bind'/*, '!ES6'*/, 'webkit', 'ltFF4'] + strip: serverBuildOptions.strip } var packagerOptions = { @@ -26,7 +27,7 @@ var packagerOptions = { src: ymlPackage.sources, dest: 'mootools-nocompat.js' }, - server: { + server: { options: { strip: serverBuild.strip, only: serverBuild.modules diff --git a/package.json b/package.json index ed560abd..94ac32fb 100644 --- a/package.json +++ b/package.json @@ -43,12 +43,10 @@ "karma-ie-launcher": "~0.1", "karma-jasmine": "~0.1.5", "karma-phantomjs-launcher": "~0.1.2", - "karma-requirejs": "~0.2.1", "karma-safari-launcher": "~0.1", "karma-sauce-launcher": "~0.2.5", "karma-script-launcher": "~0.1.0", "karma-sinon": "~1.0.2", - "load-grunt-tasks": "~0.4.0", - "requirejs": "~2.1.11" + "load-grunt-tasks": "~0.4.0" } } -- 2.11.4.GIT