github/atom
1
1
Fork 0
mirror of https://github.com/atom/atom.git synced 2026-01-26 07:19:06 -05:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' of github.com:atom/atom into aw/jasmine-junit-xml

Browse Source
This commit is contained in:
Ash Wilson
2019-02-06 10:14:32 -05:00
parent 69df3439f9 48966ef998
commit 702d5941bb
3 changed files with 18 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
package-lock.json generated
View File

@@ -5,9 +5,9 @@
"requires": true,
"dependencies": {
"@atom/nsfw": {
"version": "1.0.20",
"resolved": "https://registry.npmjs.org/@atom/nsfw/-/nsfw-1.0.20.tgz",
"integrity": "sha512-g/7g0xeqoqhnpb28GZr0I6h8q6sKzS83ic+e+40cD5GoEx8Gpo2MzlvrHvrkONGxckxnSmtcIGlon7YoT/UV3Q==",
"version": "1.0.21",
"resolved": "https://registry.npmjs.org/@atom/nsfw/-/nsfw-1.0.21.tgz",
"integrity": "sha512-ERz76RZstjDvZPM4FHwgO+9dzGkki0mJsn2r+Mu4yn29MzUuAtSmtyJDPmupVUvmz2PF7KvRbC/W2A8A6BHQhA==",
"requires": {
"fs-extra": "^7.0.0",
"lodash.isinteger": "^4.0.4",
@@ -3233,11 +3233,11 @@
"integrity": "sha512-HD6HI41u57i0/Tu9catiriURhJsef0RDrzJDkGDtdFkE9F9KPxC9Fayq2JBLJrhIyADRVXFxwxsfwQ2Jmh6hxg=="
},
"language-python": {
"version": "https://www.atom.io/api/packages/language-python/versions/0.51.8/tarball",
"integrity": "sha512-Q7KlaVoZhWftIS545wWHIAhUKOc4YFhHjR8PZzvM++awdELbpvr7q8WQRMO6aBBeyhd6vSUkDWopANhmJ95VRg==",
"version": "https://www.atom.io/api/packages/language-python/versions/0.51.9/tarball",
"integrity": "sha512-lzGnQWARAoojTmM5q9JONDkufjbt+XGOOrTe0vOFByyVdZpqcMzsS0bzhzkBJ3GHnAOp0W5DB0idwfwNtuAsag==",
"requires": {
"atom-grammar-test": "^0.6.4",
"tree-sitter-python": "^0.13.4"
"tree-sitter-python": "^0.13.6"
}
},
"language-ruby": {
@@ -5704,9 +5704,9 @@
}
},
"tree-sitter-python": {
"version": "0.13.5",
"resolved": "https://registry.npmjs.org/tree-sitter-python/-/tree-sitter-python-0.13.5.tgz",
"integrity": "sha512-mkGw5cSDvAiyB1dLFPw98oKN5RXCc9WKYDwRAY9KXul+OpPgkDn3ZmuZLtWiFUvBVtrXBHVDnfM5IV88Boozjg==",
"version": "0.13.6",
"resolved": "https://registry.npmjs.org/tree-sitter-python/-/tree-sitter-python-0.13.6.tgz",
"integrity": "sha512-QGc7dNObFv5+kCIvknO+Jv9eHusgamlcxZpLkDioAK6/dZ/f+3vbn3KQ2y4PpS1qiAHaaxh2V4XgMyv6k/rS9g==",
"requires": {
"nan": "^2.4.0"
}

6
package.json
View File

@@ -14,7 +14,7 @@
"license": "MIT",
"electronVersion": "3.0.14",
"dependencies": {
"@atom/nsfw": "^1.0.20",
"@atom/nsfw": "1.0.21",
"@atom/source-map-support": "^0.3.4",
"@atom/watcher": "1.0.8",
"about": "file:packages/about",
@@ -97,7 +97,7 @@
"language-perl": "https://www.atom.io/api/packages/language-perl/versions/0.38.1/tarball",
"language-php": "https://www.atom.io/api/packages/language-php/versions/0.44.1/tarball",
"language-property-list": "https://www.atom.io/api/packages/language-property-list/versions/0.9.1/tarball",
"language-python": "https://www.atom.io/api/packages/language-python/versions/0.51.8/tarball",
"language-python": "https://www.atom.io/api/packages/language-python/versions/0.51.9/tarball",
"language-ruby": "https://www.atom.io/api/packages/language-ruby/versions/0.72.15/tarball",
"language-ruby-on-rails": "https://www.atom.io/api/packages/language-ruby-on-rails/versions/0.25.3/tarball",
"language-rust-bundled": "file:packages/language-rust-bundled",
@@ -249,7 +249,7 @@
"language-perl": "0.38.1",
"language-php": "0.44.1",
"language-property-list": "0.9.1",
"language-python": "0.51.8",
"language-python": "0.51.9",
"language-ruby": "0.72.15",
"language-ruby-on-rails": "0.25.3",
"language-rust-bundled": "file:./packages/language-rust-bundled",

7
spec/jasmine-test-runner.coffee
View File

@@ -1,8 +1,11 @@
Grim = require 'grim'
fs = require 'fs-plus'
temp = require 'temp'
path = require 'path'
{ipcRenderer} = require 'electron'
temp.track()
module.exports = ({logFile, headless, testPaths, buildAtomEnvironment}) ->
window[key] = value for key, value of require '../vendor/jasmine'
require 'jasmine-tagged'
@@ -13,13 +16,15 @@ module.exports = ({logFile, headless, testPaths, buildAtomEnvironment}) ->
get: -> documentTitle
set: (title) -> documentTitle = title
atomHome = temp.mkdirSync prefix: 'atom-test-home-'
ApplicationDelegate = require '../src/application-delegate'
applicationDelegate = new ApplicationDelegate()
applicationDelegate.setRepresentedFilename = ->
applicationDelegate.setWindowDocumentEdited = ->
window.atom = buildAtomEnvironment({
applicationDelegate, window, document,
configDirPath: process.env.ATOM_HOME
configDirPath: atomHome
enablePersistence: false
})