Commit Graph

8936 Commits

Author SHA1 Message Date
Benjamin Gray
4bcb51984e Merge branch 'master' of github.com:atom/atom 2019-06-21 01:34:41 +10:00
Max Brunsfeld
dbdff0f56c ⬆️ language packages 2019-06-18 17:49:20 -07:00
Max Brunsfeld
7bfd33c519 Add includeChildren injection point API, use it for rust injections 2019-06-17 16:54:15 -07:00
Jason Rudolph
c7c082f705 Merge pull request #19551 from atom/revert-19459
Remove delays that we no longer need in watch-path tests
2019-06-17 13:16:03 -04:00
Nathan Sobo
2ea1f359cb Merge pull request #19538 from atom/as-ns/tokenized-line-tokens-shim
Shim tokens in TokenizedLines returned from TreeSitterLanguageMode
2019-06-14 15:06:22 -07:00
Jason Rudolph
3f2309522a Revert "add delay to watch-path tests to make them less flaky"
This reverts commit dd40782166. With the upgrade to atom/nsfw v1.0.25 in
https://github.com/atom/atom/pull/19525, we should no longer  need the
delay introduced in dd40782166.
2019-06-14 15:28:48 -04:00
Max Brunsfeld
61ef7ff573 Merge pull request #19531 from atom/mb-tree-sitter-0-15-5-test-travis
Update to Tree-sitter 0.15.5 (with travis build)
2019-06-14 12:08:36 -07:00
Antonio Scandurra
376b2e108e Shim tokens in tokenized lines returned from TreeSitterLanguageMode
Co-Authored-By: Nathan Sobo <nathan@github.com>
2019-06-14 19:23:57 +02:00
Jason Rudolph
a71aca850e Merge pull request #19525 from atom/as/jr/fix-flaky-project-spec
Fix flaky test for `Project.onDidChangeFiles()`
2019-06-14 13:00:23 -04:00
Jason Rudolph
44cad8f586 Revert "Disable flaky spec on Windows until we can identify a proper fix"
This reverts commit a0742f8e9d.

As of 8734f66aab, we're now using the nsfw fixes from
https://github.com/atom/nsfw/pull/9, which should resolve the flakiness
we were seeing on Windows.
2019-06-14 11:20:37 -04:00
Max Brunsfeld
24dd5e5a73 Update to Tree-sitter 0.15.5 2019-06-13 14:54:44 -07:00
Jason Rudolph
a0742f8e9d Disable flaky spec on Windows until we can identify a proper fix 2019-06-13 13:04:36 -04:00
Jason Rudolph
d03d2772b5 👕
Co-Authored-By: Antonio Scandurra <as-cii@github.com>
2019-06-13 12:41:50 -04:00
Jason Rudolph
9fa32c7c22 Convert spec to use async/await
Co-Authored-By: Antonio Scandurra <as-cii@github.com>
2019-06-13 11:35:12 -04:00
Jason Rudolph
c7d17f6233 If spec succeeds, clear the timeout
Prior to this change, the `console.error` statement _always_ ran, 
regardless of whether the promise resolved successfully. With this 
change, we clear the timeout in the scenario where the promise resolves 
successfully.

Co-Authored-By: Antonio Scandurra <as-cii@github.com>
2019-06-13 11:23:30 -04:00
Jason Rudolph
f9405cb25d Fix test initialization
If multiple specs were to populate the events var, one spec would 
pollute the others. So, let's reset the events var at the beginning of 
each spec.

Co-Authored-By: Antonio Scandurra <as-cii@github.com>
2019-06-13 11:16:53 -04:00
Jason Rudolph
83119fb3e4 Update onDidChangeFiles spec to use real clock
Prior to this change, the spec was using the fake clock, which was
preventing the `setTimeout` from ever calling the `expire` function.

Co-Authored-By: Antonio Scandurra <as-cii@github.com>
2019-06-13 11:14:31 -04:00
Antonio Scandurra
6d9f6befd2 Increase timeout for atom-application.test.js on CI
On Azure and Travis, we recently started observing a few test failures 
in atom-application.test.js.

After staring at those tests for a bit, it doesn't seem like they are 
failing due to a race condition. Instead, it is possible that these 
tests are simply timing out due to CI containers sometimes being 
overloaded and, thus, slower.  I tested this hypothesis locally by 
running tests on a VM while stress-testing the host machine. Tests would 
eventually have passed, but they  timed out before having the chance to 
do so.

This commit increases the timeout on CI to 10 seconds for 
`AtomApplication` tests in  an attempt to fix the spurious failures we 
were observing. This is similar to what we've historically done for 
renderer process tests (see 
7faea50190/spec/spec-helper.coffee (L50)).
2019-06-13 16:36:55 +02:00
Benjamin Gray
f141ca35a3 Merge branch 'master' of github.com:atom/atom 2019-06-12 14:39:28 +10:00
Antonio Scandurra
ae10429d08 Ensure TextEditorComponent was resized before asserting on its contents
Previously, we would wait for the next update promise after resizing the 
editor as an indicator of when the resize occurred. Unfortunately, 
resize events are unreliable and may not be emitted right away. This 
could cause the test code to wait for an update promise that was 
unrelated to the resize event (e.g., cursor blinking).

This commit uses a condition-based promise that ensures the rendered 
rows have changed as a result of the resize. This seems to fix the issue 
locally when introducing artificial timeouts in the resize event.
2019-06-11 16:20:56 +02:00
Antonio Scandurra
2e6a0acf61 Merge pull request #19457 from atom/as/debug-autocomplete-failures
Run each test suite with a pristine ATOM_HOME directory
2019-06-07 10:10:37 +02:00
Antonio Scandurra
6a88fa4185 Don't symlink compile-cache folder in AtomWindow tests
In these tests, we create a temporary `ATOM_HOME` to avoid cluttering 
the user's real `~/.atom` folder.

Adding a symlink to the real `compile-cache` was introduced to speed up 
main process tests, so that the transpilation cache could be reused. 

Unfortunately, when the real `~/.atom` folder did not exist (such as on 
a pristine environment on CI), it would confuse Atom, which would think 
that it didn't need to re-create a `compile-cache` folder again, but 
wouldn't be able to write to it because the symlink pointed to a 
non-existant directory.

Main process tests were overhauled and made faster recently, so we can 
safely remove this performance optimization.
2019-06-06 17:11:01 +02:00
Rafael Oleza
dd40782166 add delay to watch-path tests to make them less flaky 2019-06-06 16:48:15 +02:00
Rafael Oleza
33f2bd37ee Merge pull request #19444 from atom/improvements-to-ripgrep-scanner
Improvements to ripgrep scanner
2019-06-06 16:35:36 +02:00
Rafael Oleza
ac9be2d082 Remove test that checks that we can search of a subfolder of an ignored folder
This seems to not be working on Windows or with ripgrep, so it's not
expected behaviour.
2019-06-06 14:02:29 +02:00
Rafael Oleza
8c80d13dd1 Remove logic to prepend wildcard on globs
That logic was only needed to make `ripgrep` match correctly globs like
`src` when we pass it the folder to search on.

If we don't pass the folder, `ripgrep` assumes it's the cwd and their
glob matching logic improves by allowing globs like `src`.
2019-06-05 15:07:24 +02:00
Rafael Oleza
95adde37c0 Take into account the includeHidden option in ripgrep scanner 2019-06-05 10:21:06 +02:00
Rafael Oleza
8758c399db Take into account the follow option in ripgrep scanner 2019-06-04 12:21:50 +02:00
Rafael Oleza
3845862f5d Convert beforeEach() function to async 2019-06-04 12:21:50 +02:00
Rafael Oleza
7652d659e5 Take into account the excludeVcsIgnores option in ripgrep scanner 2019-06-04 12:21:50 +02:00
Nathan Sobo
2d3e332b88 Merge pull request #16100 from atom/wl-deserialize-and-activate
Activate package when deserializing
2019-06-03 13:44:58 -07:00
Antonio Scandurra
6b9b4f96f8 Merge pull request #19423 from atom/as/multi-stroke-accelerators
Display multi-keystroke key bindings in menu item's label
2019-06-03 10:57:26 +02:00
Rafael Oleza
ed6d06b16e Re-apply prettier JS formatter 2019-06-01 00:19:59 +02:00
Rafael Oleza
49cb6f4a7b Merge commit '1d9a4cafcf6cc288d675512db8fd984e13aab869' into wl-deserialize-and-activate 2019-06-01 00:19:27 +02:00
Rafael Oleza
040d96ca1b Merge commit '677bbb7f0b8754787ff9e7bfab4602ba82e13b0b' into wl-deserialize-and-activate 2019-06-01 00:18:46 +02:00
Rafael Oleza
66f7f1746a Reformat all JS files using prettier 2019-05-31 20:26:19 +02:00
Rafael Oleza
41840abdc2 Merge commit '1d9a4cafcf6cc288d675512db8fd984e13aab869' into pr18738 2019-05-31 20:25:41 +02:00
Rafael Oleza
0580aa11d1 Merge commit '677bbb7f0b8754787ff9e7bfab4602ba82e13b0b' into pr18738 2019-05-31 20:19:05 +02:00
Rafael Oleza
6263d85250 Re-apply prettier JS formatter 2019-05-31 18:55:45 +02:00
Rafael Oleza
948480665f Merge commit '1d9a4cafcf6cc288d675512db8fd984e13aab869' into wl-upgrade-webdriverio 2019-05-31 18:52:18 +02:00
Rafael Oleza
77dcd96a66 Merge commit '677bbb7f0b8754787ff9e7bfab4602ba82e13b0b' into wl-upgrade-webdriverio 2019-05-31 18:51:49 +02:00
Rafael Oleza
eb495f3ccf Merge commit '1d9a4cafcf6cc288d675512db8fd984e13aab869' into as/multi-stroke-accelerators 2019-05-31 18:45:39 +02:00
Rafael Oleza
ba7b9e39ec Merge commit '677bbb7f0b8754787ff9e7bfab4602ba82e13b0b' into as/multi-stroke-accelerators 2019-05-31 18:42:40 +02:00
Rafael Oleza
7f3f040628 Reformat all JS files using prettier 2019-05-31 18:33:56 +02:00
Rafael Oleza
677bbb7f0b Merge pull request #19408 from atom/enable-no-useless-escape-eslint-rule
Enable eslint rules that got disabled
2019-05-31 18:29:31 +02:00
Antonio Scandurra
b04695ee69 Verify context menu item label's text for multi-keystroke key bindings 2019-05-31 16:26:18 +02:00
Antonio Scandurra
091325bd02 Merge branch 'master' into electron-3.1 2019-05-29 18:35:01 +02:00
Rafael Oleza
a14b3a5ddd Enable symbol-description eslint rule 2019-05-27 11:17:29 +02:00
Rafael Oleza
9abdb2f93a Enable no-unused-expressions eslint rule 2019-05-27 11:15:37 +02:00
Rafael Oleza
2139b4b936 Enable prefer-promise-reject-errors eslint rule 2019-05-27 11:11:49 +02:00