From 1abdc097b235366759a889bdcc68359653a9b8a3 Mon Sep 17 00:00:00 2001
From: Vojta Jina
Date: Thu, 19 May 2011 17:33:25 +0200
Subject: JSTD adapter for running e2e tests
Couple of changes into angular.scenario runner:
- add autotest config (runs tests when document ready)
- update ObjectModel (forwards events)
- use only one ObjectModel instance for all outputters
- expose error msg and line number in ObjectModel.Spec and ObjectModel.Step
- fix generating spec.ids
- fix 'html' output so that it does not mutate ObjectModel
Couple of changes into docs / generator:
- rename copy -> copyTpl
- move docs/static into docs/examples (to avoid conflict with jstd proxy)
Running all docs e2e tests:
========================================================
1/ compile angular-scenario, jstd-scenario-adapter
>> rake compile
2/ build docs
>> rake docs
3/ start jstd server
>> ./server-scenario.sh
4/ capture some browser
5/ run node server to serve static content
>> node ../lib/nodeserver/server.js
6/ run tests
>> ./test-scenario.sh
---
docs/src/gen-docs.js | 26 +++++++++++++-------------
docs/src/templates/docs-scenario.html | 2 +-
docs/src/writer.js | 2 +-
3 files changed, 15 insertions(+), 15 deletions(-)
(limited to 'docs/src')
diff --git a/docs/src/gen-docs.js b/docs/src/gen-docs.js
index 83e33942..464916b1 100644
--- a/docs/src/gen-docs.js
+++ b/docs/src/gen-docs.js
@@ -25,22 +25,22 @@ var writes = callback.chain(function(){
var metadata = ngdoc.metadata(docs);
writer.output('docs-keywords.js', ['NG_PAGES=', JSON.stringify(metadata).replace(/{/g, '\n{'), ';'], writes.waitFor());
writer.copyDir('img', writes.waitFor());
- writer.copyDir('static', writes.waitFor());
- writer.copy('index.html', writes.waitFor());
- writer.copy('docs.js', writes.waitFor());
- writer.copy('docs.css', writes.waitFor());
- writer.copy('doc_widgets.js', writes.waitFor());
- writer.copy('doc_widgets.css', writes.waitFor());
- writer.copy('docs-scenario.html', writes.waitFor());
+ writer.copyDir('examples', writes.waitFor());
+ writer.copyTpl('index.html', writes.waitFor());
+ writer.copyTpl('docs.js', writes.waitFor());
+ writer.copyTpl('docs.css', writes.waitFor());
+ writer.copyTpl('doc_widgets.js', writes.waitFor());
+ writer.copyTpl('doc_widgets.css', writes.waitFor());
+ writer.copyTpl('docs-scenario.html', writes.waitFor());
writer.output('docs-scenario.js', ngdoc.scenarios(docs), writes.waitFor());
writer.output('sitemap.xml', new SiteMap(docs).render(), writes.waitFor());
writer.output('robots.txt', 'Sitemap: http://docs.angularjs.org/sitemap.xml\n', writes.waitFor());
- writer.copy('syntaxhighlighter/shBrushJScript.js', writes.waitFor());
- writer.copy('syntaxhighlighter/shBrushXml.js', writes.waitFor());
- writer.copy('syntaxhighlighter/shCore.css', writes.waitFor());
- writer.copy('syntaxhighlighter/shCore.js', writes.waitFor());
- writer.copy('syntaxhighlighter/shThemeDefault.css', writes.waitFor());
- writer.copy('jquery.min.js', writes.waitFor());
+ writer.copyTpl('syntaxhighlighter/shBrushJScript.js', writes.waitFor());
+ writer.copyTpl('syntaxhighlighter/shBrushXml.js', writes.waitFor());
+ writer.copyTpl('syntaxhighlighter/shCore.css', writes.waitFor());
+ writer.copyTpl('syntaxhighlighter/shCore.js', writes.waitFor());
+ writer.copyTpl('syntaxhighlighter/shThemeDefault.css', writes.waitFor());
+ writer.copyTpl('jquery.min.js', writes.waitFor());
});
writes.onDone(function(){
console.log('DONE. Generated ' + docs.length + ' pages in ' +
diff --git a/docs/src/templates/docs-scenario.html b/docs/src/templates/docs-scenario.html
index bc244d5d..fcc70431 100644
--- a/docs/src/templates/docs-scenario.html
+++ b/docs/src/templates/docs-scenario.html
@@ -2,7 +2,7 @@
<angular/> Docs Scenario Runner
-
+
diff --git a/docs/src/writer.js b/docs/src/writer.js
index 3251b9cd..cf54e1a3 100644
--- a/docs/src/writer.js
+++ b/docs/src/writer.js
@@ -49,7 +49,7 @@ exports.makeDir = function (path, callback) {
})();
};
-exports.copy = function(filename, callback){
+exports.copyTpl = function(filename, callback) {
copy('docs/src/templates/' + filename, OUTPUT_DIR + filename, callback);
};
--
cgit v1.2.3