Permalink
Browse files

Re-add missing DOH download. Introduce dep/dev.

 - Do not include dev-only JS libs in the npm package.
 - Add missing DOH file downloads after Dav's merge.
 - Move test fixture references to use dep/dev directories.
  • Loading branch information...
1 parent e5a9d8e commit 15f9d48ca8730400f312a57058e8edf8e3bdc034 @reid reid committed Jan 23, 2013
View
@@ -1,4 +1,5 @@
api
+dep/dev
tools
coverage.*
.git*
View
@@ -156,6 +156,7 @@ task("maintainer-clean", function () {
desc("Fetch external dependencies");
task("dep", function () {
+ jake.mkdirP('dep/dev');
spawn(process.argv[0], ["./scripts/fetch_deps.js"], complete);
}, {
async: true
View
18 LICENSE
@@ -49,22 +49,32 @@ The externally maintained libraries included with Yeti are:
Used under the MIT license.
https://github.com/sockjs/sockjs-client/blob/3f7e5f4ef5673dc15d3d3db890bc82a725f0c91d/LICENSE-MIT-SockJS
-- QUnit, located at deps/qunit.*.
+# Other externally maintained libraries
+
+These libraries are not included with Yeti, but are downloaded
+by a build step in order to test Yeti:
+
+- YUI Test, located at deps/dev/yui-test.*
+ Copyright 2013 Yahoo! Inc.
+ Used under the BSD license.
+ https://github.com/yui/yuitest/blob/9f86ac45dc811abab8591c643b13c068f3534dfe/LICENSE
+
+- QUnit, located at deps/dev/qunit.*.
Copyright 2013 jQuery Foundation and other contributors.
Used under the MIT license.
https://github.com/jquery/jquery/blob/b326225d9087ee8c5648ace3cf88feab0330353d/MIT-LICENSE.txt
-- Jasmine, located at deps/jasmine*.
+- Jasmine, located at deps/dev/jasmine*.
Copyright 2008-2011 Pivotal Labs.
Used under the MIT license.
https://github.com/pivotal/jasmine/blob/8b02bf731b193e135ccb486e99b3ecd7165bf95c/MIT.LICENSE
-- Mocha, located at deps/mocha.*.
+- Mocha, located at deps/dev/mocha.*.
Copyright 2011-2013 TJ Holowaychuk <tj@vision-media.ca>.
Used under the MIT license.
https://github.com/visionmedia/mocha/blob/8f66a59657dc37e523749f519753cdade9486b5f/LICENSE
-- Dojo, located at deps/dojo*.
+- Dojo, located at deps/dev/dojo*.
Copyright 2005-2006 The Dojo Foundation.
Used under the BSD license.
http://bugs.dojotoolkit.org/browser/dojo/trunk/LICENSE?rev=6646
View
@@ -23,7 +23,10 @@ var MOCHA_JS_URL = "https://raw.github.com/visionmedia/mocha/master/mocha.js";
var MOCHA_JS_ASSERTION_URL = "https://raw.github.com/LearnBoost/expect.js/master/expect.js";
var MOCHA_CSS_URL = "https://raw.github.com/visionmedia/mocha/master/mocha.css";
-var YUI_RUNTIME_URL = "http://yui.yahooapis.com/combo?3.7.3/build/yui-base/yui-base-min.js&3.7.3/build/oop/oop-min.js&3.7.3/build/event-custom-base/event-custom-base-min.js&3.7.3/build/event-custom-complex/event-custom-complex-min.js&3.7.3/build/attribute-events/attribute-events-min.js&3.7.3/build/attribute-core/attribute-core-min.js&3.7.3/build/base-core/base-core-min.js&3.7.3/build/cookie/cookie-min.js&3.7.3/build/array-extras/array-extras-min.js";
+var YUI_RUNTIME_URL = "http://yui.yahooapis.com/combo?3.7.3/build/yui-base/yui-base-min.js&3.7.3/build/oop/oop-min.js&3.7.3/build/event-custom-base/event-custom-base-min.js&3.7.3/build/event-custom-complex/event-custom-complex-min.js&3.7.3/build/event-base/event-base-min.js&3.7.3/build/attribute-events/attribute-events-min.js&3.7.3/build/attribute-core/attribute-core-min.js&3.7.3/build/base-core/base-core-min.js&3.7.3/build/cookie/cookie-min.js&3.7.3/build/array-extras/array-extras-min.js";
+
+var DOJO_URL = "http://download.dojotoolkit.org/release-1.8.3/dojo.js";
+var DOJO_DOH_RUNNER_URL = "http://download.dojotoolkit.org/release-1.8.3/dojo-release-1.8.3/util/doh/runner.js";
function log() {
if (process.env.npm_config_loglevel !== "silent") {
@@ -108,15 +111,17 @@ function download(err) {
}
[
- [YUI_TEST_URL, "yui-test.js"],
- [QUNIT_JS_URL, "qunit.js"],
- [QUNIT_CSS_URL, "qunit.css"],
- [JASMINE_JS_URL, "jasmine.js"],
- [JASMINE_JS_REPORTER_URL, "jasmine-html.js"],
- [JASMINE_CSS_URL, "jasmine.css"],
- [MOCHA_JS_URL, "mocha.js"],
- [MOCHA_JS_ASSERTION_URL, "expect.js"],
- [MOCHA_CSS_URL, "mocha.css"],
+ [YUI_TEST_URL, "dev/yui-test.js"],
+ [QUNIT_JS_URL, "dev/qunit.js"],
+ [QUNIT_CSS_URL, "dev/qunit.css"],
+ [JASMINE_JS_URL, "dev/jasmine.js"],
+ [JASMINE_JS_REPORTER_URL, "dev/jasmine-html.js"],
+ [JASMINE_CSS_URL, "dev/jasmine.css"],
+ [MOCHA_JS_URL, "dev/mocha.js"],
+ [MOCHA_JS_ASSERTION_URL, "dev/expect.js"],
+ [MOCHA_CSS_URL, "dev/mocha.css"],
+ [DOJO_URL, "dev/dojo.js"],
+ [DOJO_DOH_RUNNER_URL, "dev/dojo-doh-runner.js"],
[YUI_RUNTIME_URL, "yui-runtime.js"],
["http://cdn.sockjs.org/sockjs-0.3.min.js", "sock.js"]
].forEach(function downloader(args) {
@@ -1,6 +1,6 @@
<!doctype html>
<title>Yeti Basic Test with 404ing script</title>
-<script type="text/javascript" src="../../dep/yui-test.js"></script>
+<script type="text/javascript" src="../../dep/dev/yui-test.js"></script>
<script src="bogus.js"></script>
<script>
YUI().use("test", function (Y) {
View
@@ -1,7 +1,7 @@
<!doctype html>
<title>Yeti Basic Test</title>
<iframe src="frame.html"></iframe>
-<script type="text/javascript" src="../../dep/yui-test.js"></script>
+<script type="text/javascript" src="../../dep/dev/yui-test.js"></script>
<script>
YUI().use("test", function (Y) {
var SimpleTestCase = new Y.Test.Case({
View
@@ -2,9 +2,9 @@
<head>
<title>Yeti DOH Test</title>
</head>
-<script src="../../dep/dojo.js"></script>
+<script src="../../dep/dev/dojo.js"></script>
<script>define('doh/_browserRunner', function(){ /* browserRunner stub */});</script>
-<script src="../../dep/dojo-doh-runner.js"></script>
+<script src="../../dep/dev/dojo-doh-runner.js"></script>
<script>
require(["doh/runner"], function(doh){
doh._testFinished = function(group, fixture, success){
@@ -2,9 +2,9 @@
<html>
<head>
<title>Yeti Jasmine Test</title>
- <link rel="stylesheet" type="text/css" href="../../dep/jasmine.css">
- <script type="text/javascript" src="../../dep/jasmine.js"></script>
- <script type="text/javascript" src="../../dep/jasmine-html.js"></script>
+ <link rel="stylesheet" type="text/css" href="../../dep/dev/jasmine.css">
+ <script type="text/javascript" src="../../dep/dev/jasmine.js"></script>
+ <script type="text/javascript" src="../../dep/dev/jasmine-html.js"></script>
</head>
<body>
@@ -1,5 +1,5 @@
<!doctype html>
<title>Yeti Local JS Test</title>
<p>This test requires external JavaScript that will be served by Yeti's server.</p>
-<script type="text/javascript" src="../../dep/yui-test.js"></script>
+<script type="text/javascript" src="../../dep/dev/yui-test.js"></script>
<script src="local-js.js"></script>
@@ -1,6 +1,6 @@
<!doctype html>
<title>Yeti Long Async Test</title>
-<script type="text/javascript" src="../../dep/yui-test.js"></script>
+<script type="text/javascript" src="../../dep/dev/yui-test.js"></script>
<script>
YUI().use("test", function (Y) {
var LongAsyncCase = new Y.Test.Case({
View
@@ -3,9 +3,9 @@
<head>
<title>Yeti Mocha Test</title>
<meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
- <link rel="stylesheet" href="../../dep/mocha.css" />
- <script src="../../dep/mocha.js"></script>
- <script src="../../dep/expect.js"></script>
+ <link rel="stylesheet" href="../../dep/dev/mocha.css" />
+ <script src="../../dep/dev/mocha.js"></script>
+ <script src="../../dep/dev/expect.js"></script>
</head>
<body>
<div id="mocha"></div>
@@ -23,4 +23,4 @@
}
</script>
</body>
-</html>
+</html>
@@ -1,6 +1,6 @@
<!doctype html>
<title>Yeti Query String Test</title>
-<script src="../../dep/yui-test.js"></script>
+<script src="../../dep/dev/yui-test.js"></script>
<script>
YUI().use("test", function (Y) {
var QueryStringTestCase = new Y.Test.Case({
View
@@ -1,10 +1,10 @@
<!doctype html>
<head>
<title>Yeti QUnit Test</title>
- <link rel="stylesheet" href="../../dep/qunit.css">
+ <link rel="stylesheet" href="../../dep/dev/qunit.css">
</head>
<div id="qunit"></div>
-<script src="../../dep/qunit.js"></script>
+<script src="../../dep/dev/qunit.js"></script>
<script>
test("hello qunit", function () {
ok(1 == 1, "Yay!");
View
@@ -438,7 +438,7 @@ function errorContext(createBatchConfiguration) {
var DUMMY_PROTOCOL = "YetiDummyProtocol/1.0";
var SERVER_TEST_FIXTURE = fs.readFileSync(path.join(__dirname, "fixture/attach-server.html"), "utf8");
-var YUI_TEST_FIXTURE = fs.readFileSync(path.resolve(__dirname, "../dep/yui-test.js"), "utf8");
+var YUI_TEST_FIXTURE = fs.readFileSync(path.resolve(__dirname, "../dep/dev/yui-test.js"), "utf8");
function attachServerContext(testContext, explicitRoute) {
var route, testFixture;

0 comments on commit 15f9d48

Please sign in to comment.