mirrors/electron
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions
9273 commits 1 branch 183 tags 5.3 GiB
Commit graph

736 commits

Author SHA1 Message Date
Cheng Zhao
0140015500 spec: WebView is disabled when nodeIntegration is disabled 2016-05-17 17:04:13 +09:00
Cheng Zhao
f43b9665c1 And increase timeout for the rest 2016-05-15 10:00:29 +09:00
Cheng Zhao
861a79dd6a Suppress the tests that need to call window.open on Travis CI 2016-05-15 09:41:02 +09:00
Cheng Zhao
0ad03d9ff7 Suppress crashReporter test on x64 Windows for now 2016-05-13 11:12:01 +09:00
Cheng Zhao
0f52a6da39 Merge branch '1-0-release' 2016-05-11 15:14:56 +09:00
Cheng Zhao
8e7a5adc60 spec: protocol.registerStandardSchemes does not throw 2016-05-10 09:57:13 +09:00
Cheng Zhao
797b0ddb9a Fix exception when refreshing specs window 2016-05-09 20:08:50 +09:00
Cheng Zhao
af0afecb45 Merge pull request #5406 from deepak1556/protocol_standard_scheme_patch 
protocol: fix registerStandardSchemes api
 2016-05-09 09:12:35 +09:00
Cheng Zhao
c682ccd9d0 Suppress the window.open tests on travis CI's mac machine 2016-05-08 15:15:16 +09:00
deepak1556
9c71c9fa6a fix docs and spec 2016-05-08 01:37:57 +05:30
deepak1556
0f2ae385ed allow protocol module initialization before app ready. 
* ensure registerStandardSchemes can only be called before app ready
 * ensure other protocol methods can only be used after app ready
 2016-05-08 01:36:34 +05:30
deepak1556
1ff33b7c81 protocol: fix registerStandardSchemes api 2016-05-08 01:36:34 +05:30
Kevin Sawicki
609f5dcaaf Update read path to something that exists 2016-05-06 10:12:55 -07:00
Kevin Sawicki
4d6b95aa52 Tweak spec description 2016-05-06 10:12:55 -07:00
Kevin Sawicki
0eefb282ca Test no handler via call to deprecate.log 2016-05-06 10:12:55 -07:00
Kevin Sawicki
722a07de86 Add explicit call to deprecate.log 2016-05-06 10:12:55 -07:00
Kevin Sawicki
58473f41ab Remove deprecated BrowserWindow options specs 2016-05-06 10:12:54 -07:00
Kevin Sawicki
bea232f53a Update specs for internal module require 2016-05-06 10:12:54 -07:00
Kevin Sawicki
ef801d5543 Remove .only call 2016-05-06 10:12:54 -07:00
Kevin Sawicki
a6cf7a1095 Remove deprecated crashReporter.start options 2016-05-06 10:12:53 -07:00
deepak1556
45b3bd3a22 ipcRenderer: fix crash with multiple listeners to sync message 2016-05-06 02:52:59 +05:30
Cheng Zhao
8e1d2479ac spec: Should not run app.setUserActivity test on non-OS X 2016-05-05 12:27:25 +09:00
Charlie Hess
7b207aa1b6 Don't run this spec on platforms where the method is unavailable. 2016-05-03 23:33:40 -07:00
Charlie Hess
12764a66ed Add an accessor for the current activity type and write the simplest possible test. 2016-05-03 15:51:31 -07:00
Cheng Zhao
f65f8918c9 Fix specs on Windows when running without desktop session 2016-04-30 21:03:22 +09:00
Cheng Zhao
214eb0430c Fix a few failing tests on Windows 2016-04-30 18:21:18 +09:00
Cheng Zhao
8aa88067ca Do not write to stdout in Electron when running on win32 CI machine 
This makes Electron crash on CI machine somehow.
 2016-04-30 17:08:51 +09:00
Zeke Sikelianos
9f99ba3b73 update all references to old atom-log bracket notation 2016-04-29 18:35:02 -07:00
deepak1556
d64e3784f4 renderer: fix desktop capture api not responding different subsequest calls 2016-04-28 14:24:22 +05:30
deepak1556
4e6b148eaa webContents: fix executejavascript when called before page load 2016-04-28 01:54:08 +05:30
Kevin Sawicki
e4bd592e0e Add failing spec 2016-04-21 11:49:42 -07:00
deepak1556
ca756c3c24 session: allow providing permission to handle external protocols 2016-04-21 05:27:07 +05:30
Cheng Zhao
aa29dc0c8a Merge pull request #5199 from Mr0grog/5183-disambiguate-loading-from-main-frame-loading 
Add `isLoadingMainFrame()` to WebContents
 2016-04-20 20:49:56 +09:00
Rob Brackett
d3e879cd7f Change WebContents::IsLoadingMainFrame to compare SiteInstances 
(per @deepak1556's recommendation)

Also updates tests to cover the situation where navigating between pages from the same potential "site" and adds generalized tests for `isLoadingMainFrame()`.
 2016-04-19 22:05:09 -07:00
deepak1556
794d120754 rename importClientCertificate => importCertificate 2016-04-20 08:45:49 +05:30
Rob Brackett
3a9bbe30ac Test for #5183 - webContents.executeJavaScript hangs on subframe load. 2016-04-18 10:33:56 -07:00
deepak1556
2c0494dcef fix spec 2016-04-18 22:57:37 +05:30
deepak1556
2ddac9352f add spec 2016-04-18 21:53:44 +05:30
Cheng Zhao
65c612a66d Avoid external URLs 2016-04-13 19:55:59 +09:00
Cheng Zhao
0a39449694 spec: loadUrl should not crash in did-fail-provisional-load handler 2016-04-13 19:39:11 +09:00
Cheng Zhao
bb70defcb8 spec: webview should work without script tag in page 2016-04-12 15:10:26 +09:00
Cheng Zhao
5efa075aca spec: preload attribute should work without script tag in page 2016-04-12 14:57:40 +09:00
Cheng Zhao
a07612c1ed Merge branch '5074-did-get-response-details-resource-type' of https://github.com/Mr0grog/electron into Mr0grog-5074-did-get-response-details-resource-type 2016-04-11 21:05:40 +09:00
Cheng Zhao
5659ee5c0b Merge pull request #5030 from deepak1556/webrequest_response_headers_patch 
session: webRequest.OnHeadersReceived should accept status line.
 2016-04-11 20:04:32 +09:00
Rob Brackett
15b042b5f6 Add support/tests for did-get-response-details event on <WebView> 2016-04-08 12:55:20 -07:00
Rob Brackett
c1b1348735 Add resourceType arg to webContents did-get-response-details event. 
Fixes #5074 and follows @zcbenz's recommendation to expose ResourceTypeToString from atom_network_delegate publicly.
Also adds testing for other arguments to the `did-get-response-details` events, since there were no existing tests for them.
 2016-04-08 11:19:36 -07:00
deepak1556
3fb39ad3ef provide option to override status line 2016-04-08 14:03:57 +05:30
Cheng Zhao
2f6796bd7f Disable throttling in tests 2016-04-08 15:57:14 +09:00
deepak1556
4fc35a4587 session: webRequest.OnHeadersReceived should follow server redirect 
Its required to follow server redirects.
 2016-04-08 11:40:43 +05:30
Cheng Zhao
82856eb099 Merge pull request #5029 from Mr0grog/5013-add-main-frame-param-for-did-fail-load 
Add `isMainFrame` param to WebContents `did-fail-load` event
 2016-04-07 20:22:02 +09:00
Cheng Zhao
dd283ff8d7 spec: We should not use pre release of Node 2016-04-05 19:53:07 +09:00
Cheng Zhao
c562b24df8 spec: Add test case for #5028 2016-04-05 17:08:27 +09:00
Rob Brackett
f12f87d6f0 Add isMainFrame as last argument to WebContents did-fail-load event. 
Fixes #5013.
 2016-04-04 19:26:06 -07:00
Cheng Zhao
19a172f2f5 Remove the hacks because of transparent background 2016-04-02 21:21:30 +09:00
Kevin Sawicki
527ff66115 Pull app/session from remote 2016-04-01 16:59:13 -07:00
Kevin Sawicki
3695e38719 Remove duplicate require 2016-04-01 16:53:44 -07:00
Kevin Sawicki
7734f6af62 Remove semicolons 2016-04-01 16:52:55 -07:00
Kevin Sawicki
909ed54bef Remove stray log 2016-04-01 16:52:28 -07:00
Kevin Sawicki
230ed78dd6 Remove lint warnings 2016-04-01 16:51:17 -07:00
Kevin Sawicki
ef2a28ca86 Listen for browser-window-created event for asserts 2016-04-01 16:50:20 -07:00
Kevin Sawicki
fd12e1f506 Add failing spec for webview nodeIntegration inheritance 2016-04-01 16:47:17 -07:00
Kevin Sawicki
4890734f66 Add missing title param 2016-04-01 16:42:53 -07:00
Kevin Sawicki
9e66df23d0 Add clearer assertion of process being undefined 2016-04-01 16:40:33 -07:00
Kevin Sawicki
d7b1792503 Use template strings 2016-04-01 16:39:31 -07:00
Kevin Sawicki
2713580d09 Remove stray log 2016-04-01 16:39:31 -07:00
Kevin Sawicki
777704e659 Add failing spec for nodeIntegration inheritance 2016-04-01 16:39:06 -07:00
Kevin Sawicki
3c96d7b726 Rename atom.asar to electron.asar in specs 2016-04-01 16:12:57 -07:00
Cheng Zhao
b35f4c1805 spec: Fix failing test due to path delimiter 2016-04-01 16:42:44 +09:00
Cheng Zhao
247b3f3605 Fix the background color in test app 2016-04-01 16:35:19 +09:00
Cheng Zhao
b9ead472a5 spec: Remote object should be referenced by methods in its prototype chain 2016-04-01 15:35:34 +09:00
Cheng Zhao
f36851fcff spec: Remote object should be referenced by its members 2016-04-01 15:05:05 +09:00
Zeke Sikelianos
7c58f7fb02 eradicate all per-file eslint globals 2016-03-30 17:00:34 -07:00
Zeke Sikelianos
6425ef4261 restrict mocha scope to /spec; break out link tasks 2016-03-30 17:00:34 -07:00
Zeke Sikelianos
b5afad9da7 avoid using eslint comment exceptions 2016-03-30 17:00:34 -07:00
Zeke Sikelianos
e6698102c9 standardize by hand 2016-03-30 17:00:33 -07:00
Zeke Sikelianos
cfdfdc8ccc standardize by hand 2016-03-30 17:00:33 -07:00
Zeke Sikelianos
14fb3c4598 throw error if it exists 2016-03-30 17:00:33 -07:00
Zeke Sikelianos
c5f70c8d99 dance around error checking with this one weird trick 2016-03-30 17:00:32 -07:00
Zeke Sikelianos
5e4696f4a7 standardize more 2016-03-30 17:00:32 -07:00
Zeke Sikelianos
9db733a4ff mostly more globals 2016-03-30 17:00:32 -07:00
Zeke Sikelianos
c4b6cf4a8e do more manual cleanup and specify globals 2016-03-30 17:00:32 -07:00
Zeke Sikelianos
f47fa25e39 tiptoe 2016-03-30 17:00:32 -07:00
Zeke Sikelianos
f35f362272 autoformat more files 2016-03-30 17:00:31 -07:00
Zeke Sikelianos
bd9b0b8ed3 wrap conditional, because return can only be used in a function 2016-03-30 17:00:31 -07:00
Zeke Sikelianos
3855a774ab autoformat more easy files 2016-03-30 17:00:31 -07:00
Cheng Zhao
e08b48ab48 Merge pull request #4840 from atom/undefined-menu-accelerator 
Undefined menu accelerator
 2016-03-21 21:02:44 +09:00
Zeke Sikelianos
827730144b style nit 2016-03-18 10:53:49 -07:00
Zeke Sikelianos
e9ba5abe03 test for null accelerator too 2016-03-17 16:14:31 -07:00
Zeke Sikelianos
87395cdef8 add failing spec for undefined accelerator 2016-03-17 16:09:16 -07:00
Kevin Sawicki
737ffd8d7c Improve deprecated message on webPreferences options 2016-03-17 13:37:08 -07:00
Kevin Sawicki
2acfb8ad82 node-integration -> nodeIntegration 2016-03-17 13:37:07 -07:00
Kevin Sawicki
1b6e01ce6d Add missing semicolons 2016-03-17 13:37:07 -07:00
Kevin Sawicki
1e8e8f18b4 Add failing specs for deprecated options usage 2016-03-17 13:37:07 -07:00
Kevin Sawicki
5c9b19b508 web-preferences -> webPreferences 2016-03-17 13:37:07 -07:00
Cheng Zhao
081ab17e13 Merge pull request #4791 from atom/nativeimage-as-nsimage 
Convert NativeImage instances to OS-specific representations
 2016-03-17 21:49:46 +09:00
Paul Betts
148014f99a Fix spec failure 2016-03-16 12:42:23 -07:00
Paul Betts
fa197ad583 Fix failing test 2016-03-16 12:40:28 -07:00
Paul Betts
665d3166ed Update the tests 2016-03-14 21:00:58 -07:00
Cheng Zhao
73a5f323e7 Merge pull request #4788 from deepak1556/find_in_page_patch 
webcontents: provide position of match with found-in-page event
 2016-03-14 15:03:38 +09:00
Cheng Zhao
152e6af4b4 spec: Add test case for #4785 2016-03-14 14:54:45 +09:00