Remove nakedLoad and use standard require for jasmine

This commit is contained in:
Kevin Sawicki 2013-09-17 11:33:56 -07:00
parent 53dadf2d7f
commit 52abb4afc9
3 changed files with 5 additions and 14 deletions

View File

@ -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'

View File

@ -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'

4
vendor/jasmine.js vendored
View File

@ -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.