Do not build almond in the test files, I keep forgetting to run the b…

…uildTest.sh script to generate them.
requirejs · Oct 3, 2012 · 04d6d56 · 04d6d56
1 parent fbddfe2
commit 04d6d56
Show file tree

Hide file tree

Showing 17 changed files with 589 additions and 250 deletions.
diff --git a/.gitignore b/.gitignore
@@ -1,12 +1 @@
 .DS_Store
-tests/simple-built.js
-tests/moduleConfig/moduleConfig-built.js
-tests/mapConfig/mapConfig-built.js
-tests/mapConfig/mapConfigStar-built.js
-tests/mapConfig/mapConfigStarAdapter-built.js
-tests/mapConfig/mapConfigSpecificity-built.js
-tests/plugins/plugins-built.js
-tests/plugins/coffee-built.js
-tests/plugins/text-built.js
-tests/shim/shim-built.js
-tests/plugins/order/order-built.js
diff --git a/buildTest.sh b/buildTest.sh
diff --git a/tests/mapConfig/mapConfig.html b/tests/mapConfig/mapConfig.html
@@ -4,7 +4,8 @@
     <title>require.js: Map Config Test</title>
     <script type="text/javascript" src="../doh/runner.js"></script>
     <script type="text/javascript" src="../doh/_browserRunner.js"></script>
-    <script type="text/javascript" src="mapConfig-built.js"></script>
+    <script src="../../almond.js"></script>
+    <script type="text/javascript" src="mapConfig.js"></script>
 </head>
 <body>
     <h1>require.js: Map Config Test</h1>

diff --git a/tests/mapConfig/mapConfigSpecificity.html b/tests/mapConfig/mapConfigSpecificity.html
@@ -4,7 +4,8 @@
     <title>require.js: Map Config Specificity Test</title>
     <script type="text/javascript" src="../doh/runner.js"></script>
     <script type="text/javascript" src="../doh/_browserRunner.js"></script>
-    <script type="text/javascript" src="mapConfigSpecificity-built.js"></script>
+    <script src="../../almond.js"></script>
+    <script type="text/javascript" src="mapConfigSpecificity.js"></script>
 </head>
 <body>
     <h1>require.js: Map Config Specificity Test</h1>

diff --git a/tests/mapConfig/mapConfigStar.html b/tests/mapConfig/mapConfigStar.html
@@ -4,7 +4,8 @@
     <title>require.js: Map Config Star Test</title>
     <script type="text/javascript" src="../doh/runner.js"></script>
     <script type="text/javascript" src="../doh/_browserRunner.js"></script>
-    <script type="text/javascript" src="mapConfigStar-built.js"></script>
+    <script src="../../almond.js"></script>
+    <script type="text/javascript" src="mapConfigStar.js"></script>
 </head>
 <body>
     <h1>require.js: Map Config Star Test</h1>

diff --git a/tests/mapConfig/mapConfigStarAdapter.html b/tests/mapConfig/mapConfigStarAdapter.html
@@ -4,7 +4,8 @@
     <title>require.js: Map Config Star Adapter Built Test</title>
     <script type="text/javascript" src="../doh/runner.js"></script>
     <script type="text/javascript" src="../doh/_browserRunner.js"></script>
-    <script type="text/javascript" src="mapConfigStarAdapter-built.js"></script>
+    <script src="../../almond.js"></script>
+    <script type="text/javascript" src="mapConfigStarAdapter.js"></script>
 </head>
 <body>
     <h1>require.js: Map Config Star Adapter Built Test</h1>

diff --git a/tests/moduleConfig/moduleConfig.html b/tests/moduleConfig/moduleConfig.html
@@ -4,7 +4,8 @@
     <title>almond: moduleConfig Test</title>
     <script type="text/javascript" src="../doh/runner.js"></script>
     <script type="text/javascript" src="../doh/_browserRunner.js"></script>
-    <script type="text/javascript" src="moduleConfig-built.js"></script>
+    <script src="../../almond.js"></script>
+    <script type="text/javascript" src="moduleConfig.js"></script>
     <script type="text/javascript">
 	var master = new doh.Deferred();
 

diff --git a/tests/plugins/coffee.html b/tests/plugins/coffee.html
@@ -4,7 +4,8 @@
     <title>almond: Coffee Test</title>
     <script type="text/javascript" src="../doh/runner.js"></script>
     <script type="text/javascript" src="../doh/_browserRunner.js"></script>
-    <script type="text/javascript" src="coffee-built.js"></script>
+    <script src="../../almond.js"></script>
+    <script type="text/javascript" src="coffee.js"></script>
     <script type="text/javascript">
     require(["cs!csmain"],
         function(csmain) {

diff --git a/tests/plugins/order/one.js b/tests/plugins/order/one.js