mirror of
https://github.com/pulsar-edit/pulsar.git
synced 2024-09-19 06:58:26 +03:00
Remove nakedLoad and use standard require for jasmine
This commit is contained in:
parent
53dadf2d7f
commit
52abb4afc9
@ -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'
|
||||
|
@ -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
4
vendor/jasmine.js
vendored
@ -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.
|
||||
|
Loading…
Reference in New Issue
Block a user