From 982dd4c8b1159ca3a0d1b6930b944fc74b92bde9 Mon Sep 17 00:00:00 2001 From: Kevin Sawicki Date: Wed, 18 Sep 2013 15:46:19 -0700 Subject: [PATCH 1/3] Use atom-api for requires --- spec/whitespace-spec.coffee | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/spec/whitespace-spec.coffee b/spec/whitespace-spec.coffee index 8b689d4..b56bc56 100644 --- a/spec/whitespace-spec.coffee +++ b/spec/whitespace-spec.coffee @@ -1,21 +1,21 @@ -fsUtils = require 'fs-utils' +{fs} = require 'atom-api' describe "Whitespace", -> [editor, buffer, path] = [] beforeEach -> path = "/tmp/atom-whitespace.txt" - fsUtils.writeSync(path, "") + fs.writeSync(path, "") editor = project.open(path) buffer = editor.getBuffer() atom.activatePackage('whitespace') afterEach -> - fsUtils.remove(path) if fsUtils.exists(path) + fs.remove(path) if fs.exists(path) it "strips trailing whitespace before an editor saves a buffer", -> - spyOn(fsUtils, 'write') + spyOn(fs, 'write') config.set("whitespace.ensureSingleTrailingNewline", false) @@ -34,7 +34,7 @@ describe "Whitespace", -> describe "when the edit session is destroyed", -> beforeEach -> - spyOn(fsUtils, 'write') + spyOn(fs, 'write') config.set("whitespace.ensureSingleTrailingNewline", false) buffer.retain() From 235fc984b1358cb079619f9139c9b98eb0459b1f Mon Sep 17 00:00:00 2001 From: Kevin Sawicki Date: Thu, 19 Sep 2013 09:20:07 -0700 Subject: [PATCH 2/3] Remove unneeded resolve to open sample.txt --- spec/whitespace-spec.coffee | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/spec/whitespace-spec.coffee b/spec/whitespace-spec.coffee index b56bc56..c1ef981 100644 --- a/spec/whitespace-spec.coffee +++ b/spec/whitespace-spec.coffee @@ -25,7 +25,7 @@ describe "Whitespace", -> expect(editor.getText()).toBe "foo\nbar\n\nbaz" # works for buffers that are opened after extension is initialized - editor = project.open(require.resolve('fixtures/sample.txt')) + editor = project.open('sample.txt') editor.moveCursorToEndOfLine() editor.insertText(" ") From f77e52d1bc7b34ea319ce4e8e996ed4e5ec2c81e Mon Sep 17 00:00:00 2001 From: Kevin Sawicki Date: Thu, 19 Sep 2013 13:43:02 -0700 Subject: [PATCH 3/3] Rename require from atom-api to atom --- spec/whitespace-spec.coffee | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/spec/whitespace-spec.coffee b/spec/whitespace-spec.coffee index c1ef981..5a13f15 100644 --- a/spec/whitespace-spec.coffee +++ b/spec/whitespace-spec.coffee @@ -1,4 +1,4 @@ -{fs} = require 'atom-api' +{fs} = require 'atom' describe "Whitespace", -> [editor, buffer, path] = []