From e450e612483d2bbca6f846b720198795ffebdbb7 Mon Sep 17 00:00:00 2001 From: Corey Johnson Date: Tue, 22 Apr 2014 10:01:24 -0700 Subject: [PATCH 1/6] Fix broken spec --- spec/workspace-view-spec.coffee | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/spec/workspace-view-spec.coffee b/spec/workspace-view-spec.coffee index 1b9c9d770..f48dfc3d2 100644 --- a/spec/workspace-view-spec.coffee +++ b/spec/workspace-view-spec.coffee @@ -132,25 +132,25 @@ describe "WorkspaceView", -> describe "when there is an active pane item", -> it "sets the title to the pane item's title plus the project path", -> - item = atom.workspaceView.getActivePaneViewItem() + item = atom.workspace.getActivePaneItem() expect(atom.workspaceView.title).toBe "#{item.getTitle()} - #{atom.project.getPath()}" describe "when the title of the active pane item changes", -> it "updates the window title based on the item's new title", -> - editor = atom.workspaceView.getActivePaneViewItem() + editor = atom.workspace.getActivePaneItem() editor.buffer.setPath(path.join(temp.dir, 'hi')) expect(atom.workspaceView.title).toBe "#{editor.getTitle()} - #{atom.project.getPath()}" describe "when the active pane's item changes", -> it "updates the title to the new item's title plus the project path", -> atom.workspaceView.getActivePaneView().showNextItem() - item = atom.workspaceView.getActivePaneViewItem() + item = atom.workspace.getActivePaneItem() expect(atom.workspaceView.title).toBe "#{item.getTitle()} - #{atom.project.getPath()}" describe "when the last pane item is removed", -> it "updates the title to contain the project's path", -> atom.workspaceView.getActivePaneView().remove() - expect(atom.workspaceView.getActivePaneViewItem()).toBeUndefined() + expect(atom.workspace.getActivePaneItem()).toBeUndefined() expect(atom.workspaceView.title).toBe atom.project.getPath() describe "when an inactive pane's item changes", -> @@ -164,7 +164,7 @@ describe "WorkspaceView", -> describe "when the root view is deserialized", -> it "updates the title to contain the project's path", -> workspaceView2 = new WorkspaceView(atom.workspace.testSerialization()) - item = atom.workspaceView.getActivePaneViewItem() + item = atom.workspace.getActivePaneItem() expect(workspaceView2.title).toBe "#{item.getTitle()} - #{atom.project.getPath()}" workspaceView2.remove() From 1aeb32eb814372a8828451342a80742695a40474 Mon Sep 17 00:00:00 2001 From: Kevin Sawicki Date: Tue, 22 Apr 2014 10:27:20 -0700 Subject: [PATCH 2/6] Upgrade to first-mate 1.5.2 Refs atom/language-make#6 --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index 1735c8bac..e5b603dfb 100644 --- a/package.json +++ b/package.json @@ -22,7 +22,7 @@ "coffeestack": "0.7.0", "delegato": "1.x", "emissary": "^1.2.1", - "first-mate": "^1.5.1", + "first-mate": "^1.5.2", "fs-plus": "^2.2.2", "fstream": "0.1.24", "fuzzaldrin": "~1.1", From 94c860e9368c9c8b6a5a5df61655ba8383635200 Mon Sep 17 00:00:00 2001 From: Kevin Sawicki Date: Tue, 22 Apr 2014 10:43:11 -0700 Subject: [PATCH 3/6] Upgrade to language-sass@0.10.0 --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index e5b603dfb..c41d6d287 100644 --- a/package.json +++ b/package.json @@ -120,7 +120,7 @@ "language-python": "0.15.0", "language-ruby": "0.22.0", "language-ruby-on-rails": "0.12.0", - "language-sass": "0.9.0", + "language-sass": "0.10.0", "language-shellscript": "0.8.0", "language-source": "0.7.0", "language-sql": "0.8.0", From 1a02b2ec98cc9a3f31e246833f80cac04523720c Mon Sep 17 00:00:00 2001 From: Kevin Sawicki Date: Tue, 22 Apr 2014 11:06:32 -0700 Subject: [PATCH 4/6] Upgrade to atom-light-syntax@0.17.0 --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index c41d6d287..86c2bd618 100644 --- a/package.json +++ b/package.json @@ -57,7 +57,7 @@ "packageDependencies": { "atom-dark-syntax": "0.15.0", "atom-dark-ui": "0.26.0", - "atom-light-syntax": "0.16.0", + "atom-light-syntax": "0.17.0", "atom-light-ui": "0.24.0", "base16-tomorrow-dark-theme": "0.14.0", "solarized-dark-syntax": "0.14.0", From 7250a9e40759bbb29a6b8909edd10fb5a7a0f296 Mon Sep 17 00:00:00 2001 From: Kevin Sawicki Date: Tue, 22 Apr 2014 11:19:17 -0700 Subject: [PATCH 5/6] Upgrade to base16-tomorrow-dark-theme@0.15.0 --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index 86c2bd618..c8a70762b 100644 --- a/package.json +++ b/package.json @@ -59,7 +59,7 @@ "atom-dark-ui": "0.26.0", "atom-light-syntax": "0.17.0", "atom-light-ui": "0.24.0", - "base16-tomorrow-dark-theme": "0.14.0", + "base16-tomorrow-dark-theme": "0.15.0", "solarized-dark-syntax": "0.14.0", "solarized-light-syntax": "0.7.0", "archive-view": "0.30.0", From 9904a9a1971aeda3b4ee07093eaae92df9e2609c Mon Sep 17 00:00:00 2001 From: Kevin Sawicki Date: Tue, 22 Apr 2014 14:40:13 -0700 Subject: [PATCH 6/6] Upgrade to pathwatcher 1.2 --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index c8a70762b..c4d5ba530 100644 --- a/package.json +++ b/package.json @@ -36,7 +36,7 @@ "nslog": "0.5.0", "oniguruma": "^1.0.6", "optimist": "0.4.0", - "pathwatcher": "^1.1.1", + "pathwatcher": "^1.2", "property-accessors": "1.x", "q": "^1.0.1", "random-words": "0.0.1",