From 92ebf11b2aaaa357b7d3d91c297b747ae4b8fdf0 Mon Sep 17 00:00:00 2001 From: Vojta Jina Date: Fri, 17 Jun 2011 19:06:27 +0200 Subject: [PATCH] Remove obsolete scenario folder * moved scenario e2e tests in test/scenario/e2e folder * remove $location test --- scenario/application-account.html | 6 ---- scenario/application.html | 34 ------------------- scenario/browser.html | 22 ------------ scenario/datastore-scenarios.js | 19 ----------- scenario/datastore.html | 17 ---------- scenario/location.html | 19 ----------- scenario/perf.html | 33 ------------------ .../scenario/e2e}/Runner-compiled.html | 2 +- {scenario => test/scenario/e2e}/Runner.html | 2 +- {scenario => test/scenario/e2e}/style.css | 2 +- .../scenario/e2e}/widgets-scenario.js | 4 --- {scenario => test/scenario/e2e}/widgets.html | 7 +--- 12 files changed, 4 insertions(+), 163 deletions(-) delete mode 100644 scenario/application-account.html delete mode 100644 scenario/application.html delete mode 100644 scenario/browser.html delete mode 100644 scenario/datastore-scenarios.js delete mode 100644 scenario/datastore.html delete mode 100644 scenario/location.html delete mode 100644 scenario/perf.html rename {scenario => test/scenario/e2e}/Runner-compiled.html (75%) rename {scenario => test/scenario/e2e}/Runner.html (73%) rename {scenario => test/scenario/e2e}/style.css (98%) rename {scenario => test/scenario/e2e}/widgets-scenario.js (93%) rename {scenario => test/scenario/e2e}/widgets.html (93%) diff --git a/scenario/application-account.html b/scenario/application-account.html deleted file mode 100644 index 81176df7..00000000 --- a/scenario/application-account.html +++ /dev/null @@ -1,6 +0,0 @@ -
-account page goes here! - - -
- diff --git a/scenario/application.html b/scenario/application.html deleted file mode 100644 index 5d5bb809..00000000 --- a/scenario/application.html +++ /dev/null @@ -1,34 +0,0 @@ - - - - - - - - - [ login - | account - ] - - -
login screen
- - - - - (( input name )) - - 
$location={{$location}}
- - diff --git a/scenario/browser.html b/scenario/browser.html deleted file mode 100644 index eac43692..00000000 --- a/scenario/browser.html +++ /dev/null @@ -1,22 +0,0 @@ - - - - - - - -

Should mark input field red and create hover

- - -

Should reflect changes in URL

- 
$location={{$location}}
- hash:
- hashPath:
- hashSearch:
- -

Should reflect changes in Cookie

- 
$cookies={{$cookies}}
- $cookies:
- - - diff --git a/scenario/datastore-scenarios.js b/scenario/datastore-scenarios.js deleted file mode 100644 index a844ac53..00000000 --- a/scenario/datastore-scenarios.js +++ /dev/null @@ -1,19 +0,0 @@ -angular.scenarioDef.datastore = { - $before:[ - {Given:"dataset", - dataset:{ - Book:[{$id:'moby', name:"Moby Dick"}, - {$id:'gadsby', name:'Great Gadsby'}] - } - }, - {Given:"browser", at:"datastore.html#book=moby"}, - ], - checkLoadBook:[ - {Then:"drainRequestQueue"}, - - {Then:"text", at:"{{book.$id}}", should_be:"moby"}, - {Then:"text", at:"li[$index=0] {{book.name}}", should_be:"Great Gahdsby"}, - {Then:"text", at:"li[$index=0] {{book.name}}", should_be:"Moby Dick"}, - - ] -}; diff --git a/scenario/datastore.html b/scenario/datastore.html deleted file mode 100644 index 1720b3bc..00000000 --- a/scenario/datastore.html +++ /dev/null @@ -1,17 +0,0 @@ - - - - - - - - - -

{{book.$id}}

-
  • -
  • {{book.name}}
    • - - - diff --git a/scenario/location.html b/scenario/location.html deleted file mode 100644 index 75041615..00000000 --- a/scenario/location.html +++ /dev/null @@ -1,19 +0,0 @@ - - - - - - - - 
    $location={{$location}}
    - Hash Search: - -
    - href:
    - hash:
    - hashPath:
    - hashSearch:
    - - diff --git a/scenario/perf.html b/scenario/perf.html deleted file mode 100644 index 94af8b69..00000000 --- a/scenario/perf.html +++ /dev/null @@ -1,33 +0,0 @@ - - - - - - - - - -
    - - - diff --git a/scenario/Runner-compiled.html b/test/scenario/e2e/Runner-compiled.html similarity index 75% rename from scenario/Runner-compiled.html rename to test/scenario/e2e/Runner-compiled.html index 78cd7e57..c3a55f4d 100644 --- a/scenario/Runner-compiled.html +++ b/test/scenario/e2e/Runner-compiled.html @@ -1,7 +1,7 @@ - + diff --git a/scenario/Runner.html b/test/scenario/e2e/Runner.html similarity index 73% rename from scenario/Runner.html rename to test/scenario/e2e/Runner.html index fa3ccf23..387973db 100644 --- a/scenario/Runner.html +++ b/test/scenario/e2e/Runner.html @@ -1,7 +1,7 @@ - + diff --git a/scenario/style.css b/test/scenario/e2e/style.css similarity index 98% rename from scenario/style.css rename to test/scenario/e2e/style.css index 43690e2c..26540bec 100644 --- a/scenario/style.css +++ b/test/scenario/e2e/style.css @@ -8,4 +8,4 @@ tr { .redbox { background-color: red; -} \ No newline at end of file +} diff --git a/scenario/widgets-scenario.js b/test/scenario/e2e/widgets-scenario.js similarity index 93% rename from scenario/widgets-scenario.js rename to test/scenario/e2e/widgets-scenario.js index f5b923c3..e0a98224 100644 --- a/scenario/widgets-scenario.js +++ b/test/scenario/e2e/widgets-scenario.js @@ -46,10 +46,6 @@ describe('widgets', function() { element('input[type="image"]', 'form image').click(); expect(binding('button').fromJson()).toEqual({'count': 4}); - element('#navigate a', "'Go to #route' link").click(); - expect(binding('$location.hash')).toEqual('route'); - expect(browser().location().hash()).toEqual('route'); - /** * Custom value parser for futures. */ diff --git a/scenario/widgets.html b/test/scenario/e2e/widgets.html similarity index 93% rename from scenario/widgets.html rename to test/scenario/e2e/widgets.html index adf2fa27..e19a33f4 100644 --- a/scenario/widgets.html +++ b/test/scenario/e2e/widgets.html @@ -2,7 +2,7 @@ - + @@ -94,11 +94,6 @@ - - - - -