aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorIgor Minar2011-09-21 02:47:12 +0200
committerIgor Minar2011-10-03 12:24:29 -0700
commit2f128c96191825139fe9eb1b43b0e3f5b5265440 (patch)
treeeefe520a7e97f62647c1b6d7c4e2527ae54be0ba
parentf7a5f1788a794d082a05e48f728b22b47a6cc622 (diff)
downloadangular.js-2f128c96191825139fe9eb1b43b0e3f5b5265440.tar.bz2
fix(e2e): add index-nocache.html to run e2e tests without cachev0.9.x
using appcache while running e2e tests was causing the following problems: - Safari would occasionally reload the app (as a result of the appcache refresh) during the angular.validator.asychronous test, which would result in test failure and false positivy. - Firefox6 would run the tests very slowly, disabling the cache resolved the latency issues - Sometimes tests would run with stale code pulled from cache, which would result in flaky tests.
-rw-r--r--Rakefile16
-rwxr-xr-xdocs/src/gen-docs.js15
-rw-r--r--docs/src/ngdoc.js8
-rw-r--r--docs/src/writer.js19
4 files changed, 47 insertions, 11 deletions
diff --git a/Rakefile b/Rakefile
index ab8036d8..8f2d9a5c 100644
--- a/Rakefile
+++ b/Rakefile
@@ -270,6 +270,22 @@ task :package => [:clean, :compile, :docs] do
end
+ File.open("#{pkg_dir}/docs-#{NG_VERSION.full}/index-nocache.html", File::RDWR) do |f|
+ text = f.read
+ f.truncate 0
+ f.rewind
+ f.write text.sub('angular.min.js', "angular-#{NG_VERSION.full}.min.js")
+ end
+
+
+ File.open("#{pkg_dir}/docs-#{NG_VERSION.full}/index-jq-nocache.html", File::RDWR) do |f|
+ text = f.read
+ f.truncate 0
+ f.rewind
+ f.write text.sub('angular.min.js', "angular-#{NG_VERSION.full}.min.js")
+ end
+
+
File.open("#{pkg_dir}/docs-#{NG_VERSION.full}/docs-scenario.html", File::RDWR) do |f|
text = f.read
f.truncate 0
diff --git a/docs/src/gen-docs.js b/docs/src/gen-docs.js
index 4649bec3..1e1474d8 100755
--- a/docs/src/gen-docs.js
+++ b/docs/src/gen-docs.js
@@ -43,10 +43,17 @@ function writeTheRest(writesFuture) {
writesFuture.push(writer.copyDir('img'));
writesFuture.push(writer.copyDir('examples'));
writesFuture.push(writer.copyTpl('index.html'));
- writesFuture.push(writer.copy('docs/src/templates/index.html',
- 'build/docs/index-jq.html',
- '<!-- jquery place holder -->',
- '<script src=\"jquery.min.js\"><\/script>'));
+
+ writesFuture.push(writer.copy('docs/src/templates/index.html', 'build/docs/index-jq.html',
+ '<!-- jquery place holder -->', '<script src=\"jquery.min.js\"><\/script>'));
+
+ writesFuture.push(writer.copy('docs/src/templates/index.html', 'build/docs/index-nocache.html',
+ 'manifest="appcache.manifest"', ''));
+
+ writesFuture.push(writer.copy('docs/src/templates/index.html', 'build/docs/index-jq-nocache.html',
+ 'manifest="appcache.manifest"', '',
+ '<!-- jquery place holder -->', '<script src=\"jquery.min.js\"><\/script>'));
+
writesFuture.push(writer.copyTpl('offline.html'));
writesFuture.push(writer.copyTpl('docs-scenario.html'));
writesFuture.push(writer.copyTpl('jquery.min.js'));
diff --git a/docs/src/ngdoc.js b/docs/src/ngdoc.js
index 8fcf3cd5..18136957 100644
--- a/docs/src/ngdoc.js
+++ b/docs/src/ngdoc.js
@@ -549,15 +549,15 @@ Doc.prototype = {
function scenarios(docs){
var specs = [];
- specs.push('describe("angular without jquery", function() {');
- appendSpecs('index.html');
+ specs.push('describe("angular+jqlite", function() {');
+ appendSpecs('index-nocache.html');
specs.push('});');
specs.push('');
specs.push('');
- specs.push('describe("angular with jquery", function() {');
- appendSpecs('index-jq.html');
+ specs.push('describe("angular+jquery", function() {');
+ appendSpecs('index-jq-nocache.html');
specs.push('});');
return specs.join('\n');
diff --git a/docs/src/writer.js b/docs/src/writer.js
index b33e4164..a7fb227e 100644
--- a/docs/src/writer.js
+++ b/docs/src/writer.js
@@ -44,12 +44,25 @@ exports.copyTpl = function(filename) {
return exports.copy('docs/src/templates/' + filename, OUTPUT_DIR + filename);
};
-exports.copy = function (from, to, replacementKey, replacement) {
+exports.copy = function (from, to) {
+ var args = [].slice.call(arguments);
+
+ args.shift(); // drop 'from'
+ args.shift(); // drop 'to'
+
// Have to use rb (read binary), char 'r' is infered by library.
return qfs.read(from,'b').then(function(content) {
- if(replacementKey && replacement) {
- content = content.toString().replace(replacementKey, replacement);
+ var replacementKey,
+ replacement;
+
+ while (args.length) {
+ replacementKey = args.shift();
+ replacement = args.shift();
+ if(replacementKey != undefined && replacement != undefined) {
+ content = content.toString().replace(replacementKey, replacement);
+ }
}
+
qfs.write(to, content);
});
}