Commit Graph

8975 Commits

Author SHA1 Message Date
Darangi
604f34e687 adjusted expected values in tree-sitter-failing tests to match grammar changes 2020-02-10 19:48:56 +01:00
Alexis King
15c7ea0c72 🐛 Recognize git worktree directories as valid git repositories
fixes #8168
2019-08-23 14:02:54 -05:00
Jason Rudolph
4c34c11c5d
🔥 Remove unused TimeReporter class 2019-08-08 11:05:01 -04:00
Jason Rudolph
bdbb664e6a
Remove test that's testing a test helper
We appreciate the thoroughness, but we think it's OK to _not_ have this 
level of meta-testing at this point in the project.

Co-authored-by: Antonio Scandurra <as-cii@github.com>
2019-08-06 11:08:20 -04:00
Jason Rudolph
802e377cbf
Fix typo in comment
Co-authored-by: Antonio Scandurra <as-cii@github.com>
2019-08-06 11:03:35 -04:00
Tony Brix
9bc83aad87 add spec-helper tests 2019-08-05 13:07:32 -05:00
Tony Brix
ee8abde83d fix checking for jasmineMatches on null 2019-08-05 13:01:59 -05:00
Tony Brix
9a0564fbf5 add support for jasmine.any 2019-08-05 13:01:59 -05:00
Antonio Scandurra
a186428571 Fix linter errors 2019-08-02 10:31:07 +02:00
Antonio Scandurra
0693b4f48c Report scopes from shallower layers at the start or end of an injection 2019-08-01 15:48:00 +02:00
Antonio Scandurra
a46740261a Fix linter errors 2019-07-30 11:18:27 +02:00
Nathan Sobo
40ad380206 Only cover parent scope boundaries if nested layer has a scope boundary 2019-07-29 15:27:47 -06:00
Antonio Scandurra
fdd60afecb Write test to demonstrate injection grammar bug
Co-Authored-By: Nathan Sobo <nathan@github.com>
2019-07-29 19:30:03 +02:00
Rafael Oleza
f7f002fd20 Merge branch 'master' into electron-4 2019-07-19 17:35:28 +02:00
Rafael Oleza
fd6e9763a0 Fix squirrel-update specs 2019-07-04 15:21:32 +02:00
Rafael Oleza
cbe54954f4 Revert breaking changes on the WinShell module
In earlier commits from this PR, some breaking changes were done to the
WinShell module, which cause some issues on the `settings` package (and
potentially other packages).

Since these breaking changes are not needed (and they don't provide even
a better API), this PR reverts them to keep the previous contract.
2019-07-04 14:14:47 +02:00
Rafael Oleza
f7b7545fd0 Create get-app-name module that returns correct application name
Before, in order to retrieve the application name, Electron's
`getName()` method was used (https://electronjs.org/docs/api/app#appgetname).

Now, instead, we also use the Atom version in order to calculate the release
channel and be able to have it on the app name (e.g `Atom Nightly`).
2019-07-04 13:21:14 +02:00
Rafael Oleza
0578c0626e Merge branch 'master' into dw-windows-separate-channels 2019-07-04 10:34:39 +02:00
Rafael Oleza
9ae30a3545
Merge pull request #19615 from dwelle/ripgrep-pcre2
Add ripgrep pcre2 search support
2019-07-01 18:18:36 +02:00
dwelle
ef7b910ed0 Add ripgrep pcre2 support
👕 fix lint

Co-Authored-By: Rafael Oleza <rafeca@gmail.com>

fix passing PCRE2 flag in specs

👕 fix lint
2019-07-01 14:51:28 +02:00
Rafael Oleza
3d2d439f93 Fix issue when ripgrep returns matches that are empty 2019-07-01 12:49:06 +02:00
Rafael Oleza
7593d49a89 Debounce the resize event handler 2019-06-28 18:51:43 +02:00
Rafael Oleza
58a10a2cc9 Merge branch 'master' into dw-windows-separate-channels 2019-06-26 16:14:12 +02:00
Antonio Scandurra
45ef670303 Delete implementation-dependent test
Co-Authored-By: Nathan Sobo <nathan@github.com>
2019-06-25 16:40:25 +02:00
Rafael Oleza
b6644dfad8 Merge branch 'master' into dw-windows-separate-channels 2019-06-25 15:49:34 +02:00
Rafael Oleza
5b61fbaf3a Merge branch 'master' into electron-4 2019-06-24 10:17:21 +02:00
Benjamin Gray
9e1e647ec7 fix lint 2019-06-21 16:32:16 +10:00
Benjamin Gray
166d968daa adjust specs 2019-06-21 16:11:50 +10:00
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
Rafael Oleza
91b53d4b3b Use random port to initialize ChromeDriver
Since ChromeDriver v2.41, ChromeDriver will only connect if, either we precise a port
for remote debugging, either the embedder (ie electron) made sure to pass `USER_DATA_DIR`
to the remote debugging server.
So, for now, we'll just use a random port (we don't care about its value since we're not
connecting through it).

(inspired by 737db138bd).
2019-06-17 10:57:12 +02:00
Rafael Oleza
60093e45e5 Revert "Back to manual debugging it is"
This reverts commit 6e90fbe064.
2019-06-17 10:52:59 +02:00
Rafael Oleza
5ddb665831 Merge branch 'master' into electron-4 2019-06-15 10:26:34 +02: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