github/atom
1
1
Fork 0
mirror of https://github.com/atom/atom.git synced 2026-01-23 13:58:08 -05:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' into jl-all-your-normalizes

Browse Source
This commit is contained in:
Jessica Lord
2015-05-12 12:13:56 -07:00
parent d7aa2fc2c4 9fccb0dc42
commit 188ca6e9cc
3 changed files with 7 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
build/tasks/spec-task.coffee
View File

@@ -54,14 +54,14 @@ module.exports = (grunt) ->
if process.platform in ['darwin', 'linux']
options =
cmd: appPath
args: ['--test', "--resource-path=#{resourcePath}", "--spec-directory=#{path.join(packagePath, 'spec')}"]
args: ['--test', "--resource-path=#{resourcePath}", "--spec-directory=#{path.join(packagePath, 'spec')}", '--one']
opts:
cwd: packagePath
env: _.extend({}, process.env, ATOM_PATH: rootDir)
else if process.platform is 'win32'
options =
cmd: process.env.comspec
args: ['/c', appPath, '--test', "--resource-path=#{resourcePath}", "--spec-directory=#{path.join(packagePath, 'spec')}", "--log-file=ci.log"]
args: ['/c', appPath, '--test', "--resource-path=#{resourcePath}", "--spec-directory=#{path.join(packagePath, 'spec')}", "--log-file=ci.log", '--one']
opts:
cwd: packagePath
env: _.extend({}, process.env, ATOM_PATH: rootDir)

9
package.json
View File

@@ -91,11 +91,10 @@
"bookmarks": "0.35.0",
"bracket-matcher": "0.74.0",
"command-palette": "0.35.0",
"deprecation-cop": "0.45.0",
"deprecation-cop": "0.46.0",
"dev-live-reload": "0.46.0",
"encoding-selector": "0.20.0",
"exception-reporting": "0.24.0",
"feedback": "0.38.0",
"find-and-replace": "0.161.0",
"fuzzy-finder": "0.83.0",
"git-diff": "0.55.0",
@@ -109,11 +108,11 @@
"metrics": "0.45.0",
"notifications": "0.43.0",
"open-on-github": "0.36.0",
"package-generator": "0.38.0",
"package-generator": "0.39.0",
"release-notes": "0.52.0",
"settings-view": "0.198.0",
"settings-view": "0.199.0",
"snippets": "0.89.0",
"spell-check": "0.57.0",
"spell-check": "0.58.0",
"status-bar": "0.71.0",
"styleguide": "0.44.0",
"symbols-view": "0.96.0",

2
src/decoration.coffee
View File

@@ -201,6 +201,6 @@ if Grim.includeDeprecatedAPIs
Grim.deprecate 'Use Decoration::getProperties instead'
@getProperties()
Decoration::update = -> (newProperties) ->
Decoration::update = (newProperties) ->
Grim.deprecate 'Use Decoration::setProperties instead'
@setProperties(newProperties)