aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorIgor Minar2011-09-02 15:53:26 -0700
committerIgor Minar2011-09-02 17:10:25 -0700
commit5703984d4df214a492322ec83e805ebc2c4ea8c9 (patch)
tree60e03c27bdab2f0ff9a0e6498f0d8948e753721a
parentea8952177e31e0cebc77e0a9dd6b58104f3928c3 (diff)
downloadangular.js-5703984d4df214a492322ec83e805ebc2c4ea8c9.tar.bz2
test(jsonp): fixing jsonp e2e tests
- buzz api keeps on throttling our requests which makes our build fail so I'm disabling the buzz demo e2e test - the $xhr service jsonp test was modified to use jsonp on angularjs.org instead of buzz api for the same reason as mentioned above
-rw-r--r--docs/content/cookbook/buzz.ngdoc2
-rw-r--r--src/service/xhr.js10
2 files changed, 6 insertions, 6 deletions
diff --git a/docs/content/cookbook/buzz.ngdoc b/docs/content/cookbook/buzz.ngdoc
index 23473e56..a1e4a8b2 100644
--- a/docs/content/cookbook/buzz.ngdoc
+++ b/docs/content/cookbook/buzz.ngdoc
@@ -53,7 +53,7 @@ to retrieve Buzz activity and comments.
</div>
</doc:source>
<doc:scenario>
- it('fetch buzz and expand', function() {
+ xit('fetch buzz and expand', function() {
element(':button:contains(fetch)').click();
expect(repeater('div.buzz').count()).toBeGreaterThan(0);
element('.buzz a:contains(Expand replies):first').click();
diff --git a/src/service/xhr.js b/src/service/xhr.js
index 6bff6f04..f7f12b6b 100644
--- a/src/service/xhr.js
+++ b/src/service/xhr.js
@@ -145,8 +145,8 @@
<input type="text" name="url" value="index.html" size="80"/>
<button ng:click="fetch()">fetch</button><br>
<button ng:click="updateModel('GET', 'index.html')">Sample GET</button>
- <button ng:click="updateModel('JSON', 'https://www.googleapis.com/buzz/v1/activities/googlebuzz/@self?alt=json&callback=JSON_CALLBACK')">Sample JSONP (Buzz API)</button>
- <button ng:click="updateModel('JSON', 'https://www.invalid_JSONP_request.com&callback=JSON_CALLBACK')">Invalid JSONP</button>
+ <button ng:click="updateModel('JSON', 'http://angularjs.org/greet.php?callback=JSON_CALLBACK&name=Super%20Hero')">Sample JSONP</button>
+ <button ng:click="updateModel('JSON', 'http://angularjs.org/doesntexist&callback=JSON_CALLBACK')">Invalid JSONP</button>
<pre>code={{code}}</pre>
<pre>response={{response}}</pre>
</div>
@@ -159,11 +159,11 @@
expect(binding('response')).toMatch(/angularjs.org/);
});
- it('should make JSONP request to the Buzz API', function() {
- element(':button:contains("Buzz API")').click();
+ it('should make JSONP request to the angularjs.org', function() {
+ element(':button:contains("Sample JSONP")').click();
element(':button:contains("fetch")').click();
expect(binding('code')).toBe('code=200');
- expect(binding('response')).toMatch(/buzz-feed/);
+ expect(binding('response')).toMatch(/Super Hero!/);
});
it('should make JSONP request to invalid URL and invoke the error handler',