Skip to content

Commit 92ebf11

Browse files
vojtajinavojtajina
committed
Remove obsolete scenario folder
* moved scenario e2e tests in test/scenario/e2e folder * remove $location test
1 parent e6ee994 commit 92ebf11

12 files changed

+4
-163
lines changed

‎scenario/application-account.html

Lines changed: 0 additions & 6 deletions
This file was deleted.

‎scenario/application.html

Lines changed: 0 additions & 34 deletions
This file was deleted.

‎scenario/browser.html

Lines changed: 0 additions & 22 deletions
This file was deleted.

‎scenario/datastore-scenarios.js

Lines changed: 0 additions & 19 deletions
This file was deleted.

‎scenario/datastore.html

Lines changed: 0 additions & 17 deletions
This file was deleted.

‎scenario/location.html

Lines changed: 0 additions & 19 deletions
This file was deleted.

‎scenario/perf.html

Lines changed: 0 additions & 33 deletions
This file was deleted.

‎scenario/Runner-compiled.html renamed to ‎test/scenario/e2e/Runner-compiled.html

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
22
<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en">
33
<head>
4-
<script type="text/javascript" src="../build/angular-scenario.js" ng:autotest></script>
4+
<script type="text/javascript" src="../../../build/angular-scenario.js" ng:autotest></script>
55
<script type="text/javascript" src="widgets-scenario.js"></script>
66
</head>
77
<body>

‎scenario/Runner.html renamed to ‎test/scenario/e2e/Runner.html

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
22
<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en">
33
<head>
4-
<script type="text/javascript" src="../src/scenario/angular-bootstrap.js" ng:autotest></script>
4+
<script type="text/javascript" src="../../../src/scenario/angular-bootstrap.js" ng:autotest></script>
55
<script type="text/javascript" src="widgets-scenario.js"></script>
66
</head>
77
<body>

‎scenario/style.css renamed to ‎test/scenario/e2e/style.css

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,4 +8,4 @@ tr {
88

99
.redbox {
1010
background-color: red;
11-
}
11+
}

‎scenario/widgets-scenario.js renamed to ‎test/scenario/e2e/widgets-scenario.js

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -46,10 +46,6 @@ describe('widgets', function() {
4646
element('input[type="image"]', 'form image').click();
4747
expect(binding('button').fromJson()).toEqual({'count': 4});
4848

49-
element('#navigate a', "'Go to #route' link").click();
50-
expect(binding('$location.hash')).toEqual('route');
51-
expect(browser().location().hash()).toEqual('route');
52-
5349
/**
5450
* Custom value parser for futures.
5551
*/

‎scenario/widgets.html renamed to ‎test/scenario/e2e/widgets.html

Lines changed: 1 addition & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
<html xmlns:ng="http://angularjs.org">
33
<head>
44
<link rel="stylesheet" type="text/css" href="style.css"/>
5-
<script type="text/javascript" src="../src/angular-bootstrap.js" ng:autobind></script>
5+
<script type="text/javascript" src="../../../src/angular-bootstrap.js" ng:autobind></script>
66
</head>
77
<body ng:init="$window.$scope = this">
88
<table>
@@ -94,11 +94,6 @@
9494
</td>
9595
<td></td>
9696
</tr>
97-
<tr id="navigate">
98-
<td>navigate</td>
99-
<td><a href="#route">Go to #route</td>
100-
<td>{{$location.hash}}</td>
101-
</tr>
10297
</table>
10398
</body>
10499
</html>

0 commit comments

Comments
 (0)