aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorVojta Jina2011-06-17 19:06:27 +0200
committerVojta Jina2011-06-17 19:13:49 +0200
commit92ebf11b2aaaa357b7d3d91c297b747ae4b8fdf0 (patch)
tree43ea80bb929140512a189636493a47117d63aaa6
parente6ee9947645c5cca9cf6efd902cae1a4a31ea13c (diff)
downloadangular.js-92ebf11b2aaaa357b7d3d91c297b747ae4b8fdf0.tar.bz2
Remove obsolete scenario folder
* moved scenario e2e tests in test/scenario/e2e folder * remove $location test
Diffstat
-rw-r--r--scenario/application-account.html6
-rw-r--r--scenario/application.html34
-rw-r--r--scenario/browser.html22
-rw-r--r--scenario/datastore-scenarios.js19
-rw-r--r--scenario/datastore.html17
-rw-r--r--scenario/location.html19
-rw-r--r--scenario/perf.html33
-rw-r--r--test/scenario/e2e/Runner-compiled.html (renamed from scenario/Runner-compiled.html)2
-rw-r--r--test/scenario/e2e/Runner.html (renamed from scenario/Runner.html)2
-rw-r--r--test/scenario/e2e/style.css (renamed from scenario/style.css)2
-rw-r--r--test/scenario/e2e/widgets-scenario.js (renamed from scenario/widgets-scenario.js)4
-rw-r--r--test/scenario/e2e/widgets.html (renamed from scenario/widgets.html)7
12 files changed, 4 insertions, 163 deletions
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 @@
-<div ng:controller="AccountController">
-account page goes here!
- <input type="text" name="name" value="misko"/>
- <button ng:click="hello()">hello</button>
-</div>
-
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 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en">
- <head>
- <link rel="stylesheet" type="text/css" href="style.css"></link>
- <script type="text/javascript" src="../src/angular-bootstrap.js#autobind"></script>
- <script>
- function AccountController(){
- }
-
- AccountController.prototype = {
- hello: function(){
- alert(this.name);
- }
-
- };
-
- </script>
- </head>
- <body ng:init="$window.$scope = this">
- [ <a href="#login">login</a>
- | <a href="#account">account</a>
- ]
-
- <ng:switch on="$location.hashPath">
- <div ng:switch-when="login">login screen</div>
- <ng:include ng:switch-when="account" src="'application-account.html'"></ng:include>
- </ng:switch>
-
-
- (( input name ))
-
- <pre>$location={{$location}}</pre>
- </body>
- </html>
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 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01//EN" "http://www.w3.org/TR/html4/strict.dtd">
-<html xmlns:ng="http://angularjs.org">
- <head>
- <script type="text/javascript" src="../src/angular-bootstrap.js" ng:autobind></script>
- </head>
- <body ng:init="$window.$scope = this">
-
- <h1>Should mark input field red and create hover</h1>
- <input type="text" name="name" ng:required/>
-
- <h1>Should reflect changes in URL</h1>
- <pre>$location={{$location}}</pre>
- hash: <input type="text" name="$location.hash"/> <br/>
- hashPath: <input type="text" name="$location.hashPath"/> <br/>
- hashSearch: <input type="text" name="$location.hashSearch" ng:format="json"/> <br/>
-
- <h1>Should reflect changes in Cookie</h1>
- <pre>$cookies={{$cookies}}</pre>
- $cookies: <input type="text" name="$cookies" ng:format="json"/> <br/>
-
- </body>
- </html>
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 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en">
- <head>
- <script type="text/javascript" src="../lib/underscore/underscore.js"></script>
- <script type="text/javascript" src="../lib/jquery/jquery-1.3.2.js"></script>
- <script type="text/javascript" src="../src/angular-bootstrap.js"></script>
- <script type="text/javascript">
- $(document).ready(function(){angular.compile(document).init();});
- </script>
- </head>
- <body ng-entity="book=Book" ng:init="books=Book.all()">
- <p>{{book.$id}}</p>
- <li ng:repeat="book in books.$orderBy('name')">
- <li>{{book.name}}</li>
- </li>
- </body>
- </html>
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 @@
- <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en">
- <head>
- <link rel="stylesheet" type="text/css" href="style.css"/>
- <script type="text/javascript" src="../src/angular-bootstrap.js#autobind"></script>
- </head>
- <body ng:init="$window.$scope = this">
- <pre>$location={{$location}}</pre>
- Hash Search:
- <ul>
- <li ng:repeat="(key, value) in $location.hashSearch"><tt>{{key}}={{value}}</tt></li>
- </ul>
- <hr/>
- href: <input type="text" name="$location.href" size="120"/> <br/>
- hash: <input type="text" name="$location.hash" size="120"/> <br/>
- hashPath: <input type="text" name="$location.hashPath" size="120"/> <br/>
- hashSearch: <input type="text" name="$location.hashSearch" size="120" ng:format="json"/> <br/>
- </body>
- </html>
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 @@
- <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en">
- <head>
- <link rel="stylesheet" type="text/css" href="style.css"/>
- <script type="text/javascript" src="../src/angular-bootstrap.js#autobind"></script>
- <script type="text/javascript">
- function PerfCntl(){}
- PerfCntl.prototype = {
- createItems: function(){
- var items = [];
- for ( var i = 0; i < 100; i++) {
- var item = {
- name: "" + Math.random(),
- parts: [Math.random(), Math.random()]
- };
- items.push(item);
- }
- return items;
- }
- };
- </script>
- </head>
- <body ng:init="$window.$scope = this; items = createItems()" ng:controller="PerfCntl">
- <input type="text" name="text"/>
- <hr/>
- <ul>
- <li Xng:repeat="item in items.$filter('').$orderBy('name')"
- ng:repeat="item in items">
- {{item.name}} <a href="#{{item.name}}">{{item.parts.join(', ')}}</a>
- </li>
- </ul>
- </body>
- </html>
diff --git a/scenario/Runner-compiled.html b/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 @@
<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en">
<head>
- <script type="text/javascript" src="../build/angular-scenario.js" ng:autotest></script>
+ <script type="text/javascript" src="../../../build/angular-scenario.js" ng:autotest></script>
<script type="text/javascript" src="widgets-scenario.js"></script>
</head>
<body>
diff --git a/scenario/Runner.html b/test/scenario/e2e/Runner.html
index fa3ccf23..387973db 100644
--- a/scenario/Runner.html
+++ b/test/scenario/e2e/Runner.html
@@ -1,7 +1,7 @@
<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en">
<head>
- <script type="text/javascript" src="../src/scenario/angular-bootstrap.js" ng:autotest></script>
+ <script type="text/javascript" src="../../../src/scenario/angular-bootstrap.js" ng:autotest></script>
<script type="text/javascript" src="widgets-scenario.js"></script>
</head>
<body>
diff --git a/scenario/style.css b/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
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
index adf2fa27..e19a33f4 100644
--- a/scenario/widgets.html
+++ b/test/scenario/e2e/widgets.html
@@ -2,7 +2,7 @@
<html xmlns:ng="http://angularjs.org">
<head>
<link rel="stylesheet" type="text/css" href="style.css"/>
- <script type="text/javascript" src="../src/angular-bootstrap.js" ng:autobind></script>
+ <script type="text/javascript" src="../../../src/angular-bootstrap.js" ng:autobind></script>
</head>
<body ng:init="$window.$scope = this">
<table>
@@ -94,11 +94,6 @@
</td>
<td></td>
</tr>
- <tr id="navigate">
- <td>navigate</td>
- <td><a href="#route">Go to #route</td>
- <td>{{$location.hash}}</td>
- </tr>
</table>
</body>
</html>
generated by cgit v1.2.3 (git 2.25.1) at 2025-11-04 16:25:10 +0000