Merge remote-tracking branch 'origin/master' into PBL-31966/include-user-and-watch-info

# Conflicts:
#	dist/clay.js
#	test/spec/index.js
This commit is contained in:
Keegan
2016-02-27 08:35:04 +11:00
3 changed files with 9 additions and 4 deletions
+5
View File
@@ -76,10 +76,15 @@ describe('Clay', function() {
function() {
stubPebble();
var clay = fixture.clay([]);
// we stub the generateUrl method to avoid very large string comparisons.
var generateUrlStub = sinon.stub(clay, 'generateUrl');
generateUrlStub.returns('data:text/html;base64,PGh0bWw%2BVEVTVDwvaHRtbD4%3D');
Pebble.addEventListener.withArgs('showConfiguration').callArg(1);
assert(Pebble.addEventListener.calledWith('showConfiguration'));
assert(Pebble.openURL.calledWith(clay.generateUrl()));
generateUrlStub.restore();
});
it('handles the "webviewclosed" event if autoHandleEvents is not false',