diff options
| author | Andres Ornelas Mesta | 2010-05-24 13:54:32 -0700 |
|---|---|---|
| committer | Andres Ornelas Mesta | 2010-05-24 13:54:32 -0700 |
| commit | f6c67e28c94033edf6a16eb6508de54679cb49db (patch) | |
| tree | 2789a523583eaf4aa1cb74e03a4a63ff5e046f05 /scenario | |
| parent | d485421e0e5d6c502e4f62de69d1b4b353f20bbd (diff) | |
| download | angular.js-f6c67e28c94033edf6a16eb6508de54679cb49db.tar.bz2 | |
happy
Diffstat (limited to 'scenario')
| -rw-r--r-- | scenario/widgets-scenario2.js | 5 | ||||
| -rw-r--r-- | scenario/widgets.html | 1 |
2 files changed, 3 insertions, 3 deletions
diff --git a/scenario/widgets-scenario2.js b/scenario/widgets-scenario2.js index e24cabad..b966b270 100644 --- a/scenario/widgets-scenario2.js +++ b/scenario/widgets-scenario2.js @@ -4,7 +4,7 @@ browser = { var self = this; self.testFrame.load(function(){ self.testFrame.unbind(); - self.testDocument = self.testWindow.angular.element(self.testWindow.document); + self.testDocument = jQuery(self.testWindow.document); done(); }); if (this.testFrame.attr('src') == url) { @@ -23,6 +23,7 @@ function input(selector) { var input = this.testDocument.find('input[name=' + selector + ']'); input.val(value); input.trigger('change'); + this.testWindow.angular.element(input[0]).trigger('change'); done(); }); } @@ -49,6 +50,6 @@ describe('widgets', function(){ browser.navigateTo('widgets.html'); expect('{{text.basic}}').toEqual(''); input('text.basic').enter('John'); - expect('{{text.basic}}').toEqual('JohnXX'); + expect('{{text.basic}}').toEqual('John'); }); }); diff --git a/scenario/widgets.html b/scenario/widgets.html index 5c3afa21..4d0f30b0 100644 --- a/scenario/widgets.html +++ b/scenario/widgets.html @@ -2,7 +2,6 @@ <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="../lib/jquery/jquery-1.4.2.js"></script> <script type="text/javascript" src="../src/angular-bootstrap.js#autobind"></script> </head> <body ng:init="$window.$scope = this"> |