From 6b3a953384ad07c08410f58bfbdafb4640daa254 Mon Sep 17 00:00:00 2001 From: Kevin Sawicki Date: Thu, 31 Jan 2013 14:16:58 -0800 Subject: [PATCH 1/9] Close command logger when it loses focus --- src/packages/command-logger/src/command-logger-view.coffee | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/src/packages/command-logger/src/command-logger-view.coffee b/src/packages/command-logger/src/command-logger-view.coffee index 4a5f89df5..ce8c8dbbb 100644 --- a/src/packages/command-logger/src/command-logger-view.coffee +++ b/src/packages/command-logger/src/command-logger-view.coffee @@ -34,6 +34,7 @@ class CommandLoggerView extends ScrollView super @command 'core:cancel', => @detach() + @on 'blur', => @detach() unless document.activeElement is this[0] toggle: (@eventLog={}) -> if @hasParent() @@ -180,8 +181,11 @@ class CommandLoggerView extends ScrollView @focus() detach: -> - super() + return if @detaching + @detaching = true + super @rootView.focus() + @detaching = false serialize: -> eventLog: @eventLog From 30c7e8e2a5c38b76db6fb77e586398c55497644b Mon Sep 17 00:00:00 2001 From: Corey Johnson Date: Thu, 31 Jan 2013 10:57:29 -0800 Subject: [PATCH 2/9] require 'Task' uses correct case --- src/app/load-text-mate-packages-task.coffee | 2 +- src/packages/snippets/src/load-snippets-task.coffee | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/src/app/load-text-mate-packages-task.coffee b/src/app/load-text-mate-packages-task.coffee index 2eb904676..0bb0ee805 100644 --- a/src/app/load-text-mate-packages-task.coffee +++ b/src/app/load-text-mate-packages-task.coffee @@ -1,4 +1,4 @@ -Task = require 'Task' +Task = require 'task' module.exports = class LoadTextMatePackagesTask extends Task diff --git a/src/packages/snippets/src/load-snippets-task.coffee b/src/packages/snippets/src/load-snippets-task.coffee index bbef9d681..e32d70dde 100644 --- a/src/packages/snippets/src/load-snippets-task.coffee +++ b/src/packages/snippets/src/load-snippets-task.coffee @@ -1,4 +1,4 @@ -Task = require 'Task' +Task = require 'task' TextMatePackage = require 'text-mate-package' module.exports = From 5d95d8bc4eec90ce87c9ccd8f35a679bdcc1822f Mon Sep 17 00:00:00 2001 From: Corey Johnson Date: Thu, 31 Jan 2013 15:14:47 -0800 Subject: [PATCH 3/9] Remove log noise while running tests --- spec/app/syntax-spec.coffee | 3 +-- src/packages/snippets/spec/snippets-spec.coffee | 2 ++ 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/spec/app/syntax-spec.coffee b/spec/app/syntax-spec.coffee index d15eb5c74..9660fcecb 100644 --- a/spec/app/syntax-spec.coffee +++ b/spec/app/syntax-spec.coffee @@ -23,8 +23,7 @@ describe "the `syntax` global", -> expect(syntax.grammarForFilePath("/tmp/.git/config").name).toBe "Git Config" it "uses plain text if no grammar can be found", -> - filePath = require.resolve("this-is-not-a-real-file") - expect(syntax.grammarForFilePath(filePath).name).toBe "Plain Text" + expect(syntax.grammarForFilePath("this-is-not-a-real-file").name).toBe "Plain Text" describe ".getProperty(scopeDescriptor)", -> it "returns the property with the most specific scope selector", -> diff --git a/src/packages/snippets/spec/snippets-spec.coffee b/src/packages/snippets/spec/snippets-spec.coffee index 046807746..39cd4d4c6 100644 --- a/src/packages/snippets/spec/snippets-spec.coffee +++ b/src/packages/snippets/spec/snippets-spec.coffee @@ -277,6 +277,7 @@ describe "Snippets extension", -> it "terminates the worker when loading completes", -> jasmine.unspy(LoadSnippetsTask.prototype, 'loadAtomSnippets') + spyOn(console, "warn") spyOn(Worker.prototype, 'terminate').andCallThrough() snippets.loaded = false snippets.loadAll() @@ -284,6 +285,7 @@ describe "Snippets extension", -> waitsFor "all snippets to load", 5000, -> snippets.loaded runs -> + expect(console.warn).toHaveBeenCalledWith("Error reading snippets file '/Users/corey/github/atom/spec/fixtures/packages/package-with-snippets/snippets/junk-file'") expect(Worker.prototype.terminate).toHaveBeenCalled() expect(Worker.prototype.terminate.calls.length).toBe 1 From 587111074d381fe1996f8fede7084d165783763d Mon Sep 17 00:00:00 2001 From: Corey Johnson Date: Thu, 31 Jan 2013 15:15:29 -0800 Subject: [PATCH 4/9] Don't complain if restoring an unnamed buffer --- src/app/edit-session.coffee | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/app/edit-session.coffee b/src/app/edit-session.coffee index e3a906e8a..f6248c173 100644 --- a/src/app/edit-session.coffee +++ b/src/app/edit-session.coffee @@ -18,7 +18,7 @@ class EditSession if fs.exists(state.buffer) session = project.buildEditSessionForPath(state.buffer) else - console.warn "Could not build edit session for path '#{state.buffer}' because that file no longer exists" + console.warn "Could not build edit session for path '#{state.buffer}' because that file no longer exists" if state.buffer session = project.buildEditSessionForPath(null) session.setScrollTop(state.scrollTop) session.setScrollLeft(state.scrollLeft) From a383c205b71fe6e5d512d85887d255dc011a7d9b Mon Sep 17 00:00:00 2001 From: Corey Johnson Date: Thu, 31 Jan 2013 15:33:15 -0800 Subject: [PATCH 5/9] Make test output more readable --- vendor/jasmine-console-reporter.js | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/vendor/jasmine-console-reporter.js b/vendor/jasmine-console-reporter.js index fc6eb75d7..571c84aaa 100644 --- a/vendor/jasmine-console-reporter.js +++ b/vendor/jasmine-console-reporter.js @@ -31,7 +31,9 @@ jasmine.ConsoleReporter.prototype.reportSpecResults = function(spec) { for (var i = 0; i < resultItems.length; i++) { var result = resultItems[i]; if (this.logErrors && result.type == 'expect' && result.passed && !result.passed()) { - console.log("ERROR: " + spec.getFullName()) + message = spec.getFullName() + console.log("\n\n" + message) + console.log((new Array(message.length + 1)).join('-')) if (result.trace.stack) { console.log(result.trace.stack) } From 8e0b6aec40987cf54a28cdf9405caa6193e42f80 Mon Sep 17 00:00:00 2001 From: Corey Johnson Date: Thu, 31 Jan 2013 15:46:54 -0800 Subject: [PATCH 6/9] Longer spec timeout --- spec/spec-helper.coffee | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/spec/spec-helper.coffee b/spec/spec-helper.coffee index a0e49740a..1a4657488 100644 --- a/spec/spec-helper.coffee +++ b/spec/spec-helper.coffee @@ -85,7 +85,7 @@ jasmine.unspy = (object, methodName) -> throw new Error("Not a spy") unless object[methodName].originalValue? object[methodName] = object[methodName].originalValue -jasmine.getEnv().defaultTimeoutInterval = 500 +jasmine.getEnv().defaultTimeoutInterval = 1000 window.keyIdentifierForKey = (key) -> if key.length > 1 # named key From a7531c134174476de0a86875305fe11532732024 Mon Sep 17 00:00:00 2001 From: Corey Johnson Date: Thu, 31 Jan 2013 15:54:36 -0800 Subject: [PATCH 7/9] :shit: --- src/packages/snippets/spec/snippets-spec.coffee | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/src/packages/snippets/spec/snippets-spec.coffee b/src/packages/snippets/spec/snippets-spec.coffee index 39cd4d4c6..c9582a336 100644 --- a/src/packages/snippets/spec/snippets-spec.coffee +++ b/src/packages/snippets/spec/snippets-spec.coffee @@ -285,7 +285,8 @@ describe "Snippets extension", -> waitsFor "all snippets to load", 5000, -> snippets.loaded runs -> - expect(console.warn).toHaveBeenCalledWith("Error reading snippets file '/Users/corey/github/atom/spec/fixtures/packages/package-with-snippets/snippets/junk-file'") + expect(console.warn).toHaveBeenCalled() + expect(console.warn.argsForCall[0]).toMatch /Error reading snippets file '.*?\/spec\/fixtures\/packages\/package-with-snippets\/snippets\/junk-file'/ expect(Worker.prototype.terminate).toHaveBeenCalled() expect(Worker.prototype.terminate.calls.length).toBe 1 From 801283d022086d79d0a33d0b0128ee3796b4b960 Mon Sep 17 00:00:00 2001 From: Corey Johnson Date: Thu, 31 Jan 2013 16:02:25 -0800 Subject: [PATCH 8/9] wait a bit after tree-view:move specs --- src/packages/tree-view/spec/tree-view-spec.coffee | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/src/packages/tree-view/spec/tree-view-spec.coffee b/src/packages/tree-view/spec/tree-view-spec.coffee index c788842bf..f0a83fe63 100644 --- a/src/packages/tree-view/spec/tree-view-spec.coffee +++ b/src/packages/tree-view/spec/tree-view-spec.coffee @@ -761,7 +761,7 @@ describe "TreeView", -> expect(addDialog.miniEditor.getText().length).toBe 0 - describe "tree-view:move", -> + fdescribe "tree-view:move", -> describe "when a file is selected", -> moveDialog = null @@ -770,6 +770,9 @@ describe "TreeView", -> treeView.trigger "tree-view:move" moveDialog = rootView.find(".tree-view-dialog").view() + afterEach -> + waits 50 # The move specs cause too many false positives because of their async nature, so wait a little bit before we cleanup + it "opens a move dialog with the file's current path (excluding extension) populated", -> extension = fs.extension(filePath) fileNameWithoutExtension = fs.base(filePath, extension) From f62e49d2f4232153d13dc03b34f6022aa1efa8f8 Mon Sep 17 00:00:00 2001 From: Jon Rohan Date: Fri, 1 Feb 2013 11:09:12 -0500 Subject: [PATCH 9/9] Adding back the font-weight font-style to tmThemes We can add this back now because in the default tests we're using a true monospaced font, not the fake monospace font Inconsolata. --- spec/app/text-mate-theme-spec.coffee | 2 +- src/app/text-mate-theme.coffee | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/spec/app/text-mate-theme-spec.coffee b/spec/app/text-mate-theme-spec.coffee index 5191ced55..e1c04ec90 100644 --- a/spec/app/text-mate-theme-spec.coffee +++ b/spec/app/text-mate-theme-spec.coffee @@ -42,7 +42,7 @@ describe "TextMateTheme", -> selector: ".invalid.deprecated" properties: 'color': "#D2A8A1" - # 'font-style': 'italic' + 'font-style': 'italic' 'text-decoration': 'underline' expect(rulesets[13]).toEqual diff --git a/src/app/text-mate-theme.coffee b/src/app/text-mate-theme.coffee index ee78cdea7..cb1d3558a 100644 --- a/src/app/text-mate-theme.coffee +++ b/src/app/text-mate-theme.coffee @@ -75,8 +75,8 @@ class TextMateTheme extends Theme if fontStyle fontStyles = fontStyle.split(/\s+/) - # properties['font-weight'] = 'bold' if _.contains(fontStyles, 'bold') - # properties['font-style'] = 'italic' if _.contains(fontStyles, 'italic') + properties['font-weight'] = 'bold' if _.contains(fontStyles, 'bold') + properties['font-style'] = 'italic' if _.contains(fontStyles, 'italic') properties['text-decoration'] = 'underline' if _.contains(fontStyles, 'underline') properties['color'] = @translateColor(foreground) if foreground