Skip to content

Commit 8af8a4e

Browse files
cpojercpojer
committed
* Adjusting to the new structure
1 parent bca1f8f commit 8af8a4e

9 files changed

+66
-62
lines changed

Diff for: ‎buildCommonJS

100644100755
+2-4
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ $options = json_decode($argv[1], true);
1212
$path = !empty($options['path']) ? $options['path'] : '../';
1313

1414
$pkg = new Packager(array(
15-
dirname(__FILE__) . '/' . $path,
15+
dirname(__FILE__) . '/../' . $path,
1616
dirname(__FILE__) . '/CommonJS-Loader/'
1717
));
1818

@@ -30,6 +30,4 @@ $output = $pkg->build($files, array(), array(), array('1.2compat'));
3030

3131
echo $output;
3232

33-
fclose($stderr);
34-
35-
?>
33+
fclose($stderr);

Diff for: ‎buildJSTDConfiguration.js renamed to ‎buildJSTDConfiguration

+7-6
Original file line numberDiff line numberDiff line change
@@ -10,18 +10,19 @@ var data = 'server: http://localhost:9876\n\n';
1010
data += 'load:\n';
1111
load = function(object, base){
1212
for (var j = 0; j < object.length; j++)
13-
data += ' - "' + (base || '') + object[j] + '.js"\n';
13+
data += ' - "../' + (base || '') + object[j] + '.js"\n';
1414
};
1515

1616
require('./Helpers/Loader');
1717

18-
var Source = require('./Source').Source,
19-
Sets = require('./Sets').Sets;
18+
var Configuration = require('../Configuration').Configuration,
19+
Source = Configuration.source,
20+
Sets = Configuration.sets;
2021

2122
load([
22-
'Jasmine/jasmine',
23-
'JSTD-Adapter/src/JasmineAdapter',
24-
'Helpers/JSSpecToJasmine'
23+
'Runner/Jasmine/jasmine',
24+
'Runner/JSTD-Adapter/src/JasmineAdapter',
25+
'Runner/Helpers/JSSpecToJasmine'
2526
]);
2627

2728
loadLibrary(Source, options);

Diff for: ‎index.html

+13-41
Original file line numberDiff line numberDiff line change
@@ -1,53 +1,25 @@
11
<!DOCTYPE html>
22
<html>
33
<head>
4-
<title>Specs for MooTools Core</title>
5-
<link rel="stylesheet" href="Specs/assets/screen.css" type="text/css" media="screen" title="no title" charset="utf-8" />
6-
<!--[if IE]><link rel="stylesheet" href="Specs/assets/ie.css" type="text/css" media="screen" title="no title" charset="utf-8" /><![endif]-->
7-
<style type="text/css" media="screen">
8-
9-
.container {
10-
padding:3em;
11-
width: auto;
12-
}
13-
14-
#select {
15-
text-align:right;
16-
}
17-
#select fieldset {
18-
text-align:left;
19-
}
20-
#select label {
21-
text-align:right;
22-
}
23-
#select div input {
24-
line-height: 2em;
25-
}
26-
27-
28-
ul#prebuilt {
29-
padding-left:0;
30-
list-style:none;
31-
}
32-
ul#prebuilt li a {
33-
font-size: 1.5em;
34-
text-decoration: none;
35-
padding: 0.5em;
36-
}
37-
ul#prebuilt li a:hover {
38-
background-color: #eee;
39-
}
40-
41-
</style>
4+
<title>Spec Runner</title>
5+
<link rel="stylesheet" href="runner.css" type="text/css" media="screen" title="no title" charset="utf-8" />
6+
7+
<script type="text/javascript" src="../Configuration.js"></script>
428
</head>
439
<body>
4410
<div class="container">
4511

46-
<h1><strong>Specs</strong> for MooTools-Core</h1>
12+
<h1><strong>Specs</strong> for <script>document.write(Configuration.name);</script></h1>
4713

4814
<ul id="prebuilt">
49-
<li><a href="runner.html?version=1.3&specs=1.2">&rarr; MooTools-Core 1.2 Specs</a></li>
50-
<li><a href="runner.html?version=1.3&specs=1.2&specs=1.3base&specs=1.3client">&rarr; MooTools-Core 1.3: 1.2 + 1.3base + 1.3client Specs</a></li>
15+
<script>
16+
(function(){
17+
for (var i = 0; i < Configuration.presets.length; i++){
18+
var preset = Configuration.presets[i];
19+
document.write('<li><a href="runner.html?version=' + preset.version + '&specs=' + preset.specs.join('&specs=') + '&path=' + (preset.path || '') + '">&rarr; ' + Configuration.name + ' ' + preset.version + ': ' + preset.specs.join(' + ') + ' Specs</a></li>');
20+
}
21+
})();
22+
</script>
5123
</ul>
5224

5325
</div>

Diff for: ‎runner

100644100755
File mode changed.

Diff for: ‎runner.css

+34
Original file line numberDiff line numberDiff line change
@@ -138,3 +138,37 @@ pre.examples-code code {
138138
scrollbar-shadow-color: #eee;
139139
scrollbar-darkshadow-color: #FFF;
140140
}
141+
142+
143+
/* INDEX PAGE */
144+
.container {
145+
padding:3em;
146+
width: auto;
147+
}
148+
149+
#select {
150+
text-align:right;
151+
}
152+
#select fieldset {
153+
text-align:left;
154+
}
155+
#select label {
156+
text-align:right;
157+
}
158+
#select div input {
159+
line-height: 2em;
160+
}
161+
162+
163+
ul#prebuilt {
164+
padding-left:0;
165+
list-style:none;
166+
}
167+
ul#prebuilt li a {
168+
font-size: 1.5em;
169+
text-decoration: none;
170+
padding: 0.5em;
171+
}
172+
ul#prebuilt li a:hover {
173+
background-color: #eee;
174+
}

Diff for: ‎runner.html

+7-8
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@
1212

1313
var load = function(object, base){
1414
for (var j = 0; j < object.length; j++)
15-
document.write('<scr'+'ipt src="' + (base || '') + object[j] + '.js" type="text/javascript"><\/script>');
15+
document.write('<scr'+'ipt src="../' + (base || '') + object[j] + '.js" type="text/javascript"><\/script>');
1616
};
1717

1818
</script>
@@ -23,20 +23,19 @@
2323
<script type="text/javascript" src="Helpers/jasmine-html.js"></script>
2424
<script type="text/javascript" charset="utf-8" src="Helpers/JSSpecToJasmine.js"></script>
2525
<script type="text/javascript" charset="utf-8" src="Helpers/Loader.js"></script>
26-
<script type="text/javascript" charset="utf-8" src="Source.js"></script>
27-
<script type="text/javascript" charset="utf-8" src="Sets.js"></script>
26+
<script type="text/javascript" charset="utf-8" src="../Configuration.js"></script>
2827

2928
<script type="text/javascript" charset="utf-8">
30-
var Name = 'MooTools Core',
29+
var Version,
3130
SpecNames = [];
3231

3332
(function(){
3433
var queryString = document.location.search.substr(1);
3534

36-
var version = loadLibrary(Source, queryString);
35+
var version = loadLibrary(Configuration.source, queryString);
3736

38-
Name += version;
39-
SpecNames = loadSpecs(Sets, queryString);
37+
Version = version;
38+
SpecNames = loadSpecs(Configuration.sets, queryString);
4039

4140
window.onload = function(){
4241
jasmine.getEnv().addReporter(new jasmine.TrivialReporter());
@@ -49,6 +48,6 @@
4948
<title>Specs for MooTools-Core</title>
5049
</head>
5150
<body>
52-
<div id="framework_name"><script>document.write(Name + ' [' + SpecNames.join(', ') + ']')</script></div>
51+
<div id="framework_name"><script>document.write(Configuration.name + ' ' + Version + ' [' + SpecNames.join(', ') + ']')</script></div>
5352
</body>
5453
</html>

Diff for: ‎runner.js

100644100755
+2-2
Original file line numberDiff line numberDiff line change
@@ -18,12 +18,12 @@ require('./MooTools').apply(GLOBAL);
1818

1919
require('./Helpers/Loader');
2020

21-
var Sets = require('./Sets').Sets;
21+
var Sets = require('../Configuration').Configuration.sets;
2222

2323
var specs = [];
2424
load = function(object, base){
2525
for (var j = 0; j < object.length; j++)
26-
specs.push(__dirname + '/' + (base || '') + object[j]);
26+
specs.push(__dirname + '/../' + (base || '') + object[j]);
2727
};
2828

2929
loadSpecs(Sets, options);

Diff for: ‎server

100644100755
+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
11
# Usage: ./server '{"version": 1.3, "path": "../core/", "specs": [1.2, "1.3base", "1.3client"]}'
22

3-
./buildJSTDConfiguration.js "$1"
3+
./buildJSTDConfiguration "$1"
44
java -jar ./JSTestDriver/JsTestDriver.jar --port 9876 --runnerMode DEBUG

Diff for: ‎test

100644100755
File mode changed.

0 commit comments

Comments
 (0)