diff --git a/test/index-release.html b/test/index-release.html
deleted file mode 100644
index ef9d3400..00000000
--- a/test/index-release.html
+++ /dev/null
@@ -1,31 +0,0 @@
-
-
-
-
-
-
-
-
-
-Monaco Editor (running from release)
-
-
-
-
-
-
-
-
-
-
-
-
\ No newline at end of file
diff --git a/test/index.html b/test/index.html
index cbe00c2b..0ef435df 100644
--- a/test/index.html
+++ b/test/index.html
@@ -9,11 +9,8 @@
Monaco Editor (running from multiple sources)
-[MULTIPLE SOURCES]
- |
-[RELEASED]
- |
-[SMOKETEST]
+Jump to:
+[SMOKETEST]
|
[fixed element]
|
diff --git a/test/smoketest-release.html b/test/smoketest.html
similarity index 68%
rename from test/smoketest-release.html
rename to test/smoketest.html
index cd10c8e2..54650329 100644
--- a/test/smoketest-release.html
+++ b/test/smoketest.html
@@ -23,21 +23,17 @@
-Smoke Test (running from release)
+Smoke Test
-
+
+
diff --git a/test/smoketest.js b/test/smoketest.js
index 2afa88b8..1e8876e2 100644
--- a/test/smoketest.js
+++ b/test/smoketest.js
@@ -1,5 +1,10 @@
///
-define([], function() {
+define(['./samples-all'], function(ALL_SAMPLES) {
+
+var XHR_SAMPLES = {};
+ALL_SAMPLES.forEach(function(sample) {
+ XHR_SAMPLES[sample.name] = sample.content;
+});
var actions = (function() {
"use strict";
@@ -88,11 +93,9 @@ function createEditor(container, mode) {
editors[mode] = monaco.editor.create(container, {
value: mode
});
- xhr('samples/sample.' + mode + '.txt').then(function(response) {
- var value = mode + '\n' + response.responseText;
- var model = monaco.editor.createModel(value, mode);
- editors[mode].setModel(model);
- });
+ var value = mode + '\n' + XHR_SAMPLES['sample.' + mode + '.txt'];
+ var model = monaco.editor.createModel(value, mode);
+ editors[mode].setModel(model);
}
function createEditors(modes) {
@@ -133,33 +136,4 @@ function createActions(actions) {
createEditors(getAllModes());
createActions(actions);
-function xhr(url) {
- var req = null;
- return new monaco.Promise(function(c,e,p) {
- req = new XMLHttpRequest();
- req.onreadystatechange = function () {
- if (req._canceled) { return; }
-
- if (req.readyState === 4) {
- if ((req.status >= 200 && req.status < 300) || req.status === 1223) {
- c(req);
- } else {
- e(req);
- }
- req.onreadystatechange = function () { };
- } else {
- p(req);
- }
- };
-
- req.open("GET", url, true );
- req.responseType = "";
-
- req.send(null);
- }, function () {
- req._canceled = true;
- req.abort();
- });
-}
-
});
\ No newline at end of file