Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

loading via AMD can break #523

Merged
merged 25 commits into from
Aug 5, 2014
Merged

loading via AMD can break #523

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
25 commits
Select commit Hold shift + click to select a range
6284662
refactor lib/sinon to attach API to an object
neonstalwart Jul 31, 2014
e03d76f
fake_xml_http_request needs sinon to exist
neonstalwart Jul 31, 2014
52e4ef9
return sinon from makeApi
neonstalwart Jul 31, 2014
46c6760
explicit dependencies for fake_xml_http_request
neonstalwart Jul 31, 2014
6ff0b27
explicit dependencies for event
neonstalwart Jul 31, 2014
edecd30
explicit depenencies for fake_server
neonstalwart Jul 31, 2014
b092416
explicit dependencies for fake_server_with_clock
neonstalwart Jul 31, 2014
3867782
explicit dependencies for fake_timers
neonstalwart Jul 31, 2014
f0c765f
explicit dependencies for fake_xdomain_request
neonstalwart Jul 31, 2014
f17520a
add event dependency for fake_xml_http_request
neonstalwart Jul 31, 2014
2b2cf19
explicit dependencies for assert
neonstalwart Jul 31, 2014
e1d7256
explicit dependencies for behavior
neonstalwart Jul 31, 2014
2ba34f3
explicit dependencies for call
neonstalwart Jul 31, 2014
b06ec8d
explicit dependencies for collection
neonstalwart Jul 31, 2014
05e4fe3
explicit dependencies for match
neonstalwart Jul 31, 2014
9ecbb81
explicit dependencies for mock
neonstalwart Jul 31, 2014
69d39bf
explicit dependencies for sandbox
neonstalwart Jul 31, 2014
e609ef8
explicit dependencies for spy
neonstalwart Jul 31, 2014
b8b3f19
explicit dependencies for stub
neonstalwart Jul 31, 2014
1ed7d43
explicit dependencies for test
neonstalwart Jul 31, 2014
2d9716d
explicit dependencies for test_case
neonstalwart Jul 31, 2014
f60897d
scope the simulated define
neonstalwart Jul 31, 2014
e789734
add missing exports and module references
neonstalwart Aug 1, 2014
5d2c423
add lib/sinon/util/core
neonstalwart Aug 1, 2014
21ce498
apply formatter config change from 15a7e8e
neonstalwart Aug 5, 2014
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 2 additions & 0 deletions build
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -47,10 +47,12 @@ formatio not found, skipping. To build with formatio support:
File.open(file, "w") do |f|
f.puts("this.sinon = (function () {")
f.puts("var samsam, formatio;")
f.puts("(function () {")
f.puts("function define(mod, deps, fn) { if (mod == \"samsam\") { samsam = deps(); } else if (typeof fn === \"function\") { formatio = fn(samsam); } }")
f.puts("define.amd = {};")
f.puts(File.read("./node_modules/formatio/node_modules/samsam/lib/samsam.js"))
f.puts(File.read("./node_modules/formatio/lib/formatio.js"))
f.puts("})();")
f.puts(contents)
f.puts("return sinon;}.call(typeof window != 'undefined' && window || {}));")
end
Expand Down
Loading