mirrors/electron
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages 1 Wiki Activity Actions 1

Merge pull request #4714 from atom/chrome49

Browse source 
Upgrade to Chrome 49
This commit is contained in:
Cheng Zhao 2016-03-11 21:39:52 +09:00
commit 6aec1e6949
145 changed files with 642 additions and 585 deletions
Download patch file Download diff file Expand all files Collapse all files

8
spec/webview-spec.js
View file

@ -548,11 +548,10 @@ describe('<webview> tag', function() {
});
describe('executeJavaScript', function() {
if (process.env.TRAVIS !== 'true') {
return;
}
it('should support user gesture', function(done) {
if (process.env.TRAVIS !== 'true' || process.platform == 'darwin')
return done();
var listener = function() {
webview.removeEventListener('enter-html-full-screen', listener);
done();
@ -569,6 +568,7 @@ describe('<webview> tag', function() {
});
it('can return the result of the executed script', function(done) {
this.timeout(50000);
var listener = function() {
var jsScript = "'4'+2";
webview.executeJavaScript(jsScript, false, function(result) {