diff options
| author | Vojta Jina | 2011-05-19 17:33:25 +0200 |
|---|---|---|
| committer | Igor Minar | 2011-05-19 09:43:56 -0700 |
| commit | 1abdc097b235366759a889bdcc68359653a9b8a3 (patch) | |
| tree | ed53346c171de6c60748e65c7f7f065cc8837103 /src/scenario/angular-bootstrap.js | |
| parent | 9f56af9c15e1096033c91c2619f7f7f0115d0032 (diff) | |
| download | angular.js-1abdc097b235366759a889bdcc68359653a9b8a3.tar.bz2 | |
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
Diffstat (limited to 'src/scenario/angular-bootstrap.js')
| -rw-r--r-- | src/scenario/angular-bootstrap.js | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/src/scenario/angular-bootstrap.js b/src/scenario/angular-bootstrap.js index 68dc393e..264ce718 100644 --- a/src/scenario/angular-bootstrap.js +++ b/src/scenario/angular-bootstrap.js @@ -23,7 +23,8 @@ try { if (previousOnLoad) previousOnLoad(); } catch(e) {} - angularScenarioInit($scenario, angularJsConfig(document)); + var config = angularJsConfig(document); + if (config.autotest) angular.scenario.setUpAndRun(config); }; addCSS("../../css/angular-scenario.css"); @@ -52,8 +53,7 @@ // Create the runner (which also sets up the global API) document.write( '<script type="text/javascript">' + - 'var $scenario = new angular.scenario.Runner(window, angular.scenario.SpecRunner);' + - '</script>' - ); + ' var $runner = new angular.scenario.Runner(window);' + + '</script>'); })(window.onload); |
