diff --git a/spec/jasmine-helper.coffee b/spec/jasmine-helper.coffee index f7c5acef2..784b063f5 100644 --- a/spec/jasmine-helper.coffee +++ b/spec/jasmine-helper.coffee @@ -1,16 +1,7 @@ -window.nakedLoad = (file) -> - fsUtils = require 'fs-utils' - path = require 'path' - file = require.resolve(file) - code = fsUtils.read(file) - if path.extname(file) is '.coffee' - require('coffee-script').eval(code, filename: file) - else - window.eval("#{code}\n//@ sourceURL=#{file}") - module.exports.runSpecSuite = (specSuite, logErrors=true) -> {$$} = require 'space-pen' - nakedLoad 'jasmine' + for key, value of require '../vendor/jasmine' + window[key] = value require 'jasmine-focused' $ = require 'jquery' diff --git a/spec/spec-helper.coffee b/spec/spec-helper.coffee index 881471b91..102a513cb 100644 --- a/spec/spec-helper.coffee +++ b/spec/spec-helper.coffee @@ -2,7 +2,7 @@ require 'window' window.setUpEnvironment('spec') window.restoreDimensions() -nakedLoad 'jasmine-jquery' +require '../vendor/jasmine-jquery' path = require 'path' $ = jQuery = require 'jquery' _ = require 'underscore' diff --git a/vendor/jasmine.js b/vendor/jasmine.js index 0da28abfa..1b80d662f 100644 --- a/vendor/jasmine.js +++ b/vendor/jasmine.js @@ -1,10 +1,10 @@ // Modified line // - var isCommonJS = typeof window == "undefined" && typeof exports == "object"; -// + +// + var isCommonJS = typeof exports == "object"; // // Modified method jasmine.WaitsForBlock.prototype.execute -var isCommonJS = typeof window == "undefined" && typeof exports == "object"; +var isCommonJS = typeof exports == "object"; /** * Top level namespace for Jasmine, a lightweight JavaScript BDD/spec/testing framework.