From 932d3755ce86a545e67e5bf93672f4bb16bdd0f6 Mon Sep 17 00:00:00 2001 From: Nathan Sobo Date: Fri, 9 Jan 2015 08:50:41 -0800 Subject: [PATCH] Rename `stylesheets/` directory in fixture packages --- .../styles}/1.css | 0 .../styles}/2.less | 0 .../styles}/3.test-context.css | 0 .../styles}/4.css | 0 .../styles}/1.css | 0 .../styles}/2.less | 0 .../{stylesheets => styles}/3.css | 0 .../{stylesheets => styles}/editor.less | 0 .../{stylesheets => styles}/ui-variables.less | 0 .../{stylesheets => styles}/first.css | 0 .../{stylesheets => styles}/last.css | 0 .../{stylesheets => styles}/second.less | 0 .../{stylesheets => styles}/editor.less | 0 .../{stylesheets => styles}/editor.less | 0 .../{stylesheets => styles}/ui-variables.less | 0 .../{stylesheets => styles}/a.css | 0 .../{stylesheets => styles}/b.css | 0 .../{stylesheets => styles}/c.less | 0 .../{stylesheets => styles}/d.csv | 0 spec/package-manager-spec.coffee | 28 +++++++++---------- 20 files changed, 14 insertions(+), 14 deletions(-) rename spec/fixtures/packages/{package-with-stylesheets-manifest/stylesheets => package-with-styles/styles}/1.css (100%) rename spec/fixtures/packages/{package-with-stylesheets-manifest/stylesheets => package-with-styles/styles}/2.less (100%) rename spec/fixtures/packages/{package-with-stylesheets/stylesheets => package-with-styles/styles}/3.test-context.css (100%) rename spec/fixtures/packages/{package-with-stylesheets/stylesheets => package-with-styles/styles}/4.css (100%) rename spec/fixtures/packages/{package-with-stylesheets/stylesheets => package-with-stylesheets-manifest/styles}/1.css (100%) rename spec/fixtures/packages/{package-with-stylesheets/stylesheets => package-with-stylesheets-manifest/styles}/2.less (100%) rename spec/fixtures/packages/package-with-stylesheets-manifest/{stylesheets => styles}/3.css (100%) rename spec/fixtures/packages/theme-with-incomplete-ui-variables/{stylesheets => styles}/editor.less (100%) rename spec/fixtures/packages/theme-with-incomplete-ui-variables/{stylesheets => styles}/ui-variables.less (100%) rename spec/fixtures/packages/theme-with-package-file/{stylesheets => styles}/first.css (100%) rename spec/fixtures/packages/theme-with-package-file/{stylesheets => styles}/last.css (100%) rename spec/fixtures/packages/theme-with-package-file/{stylesheets => styles}/second.less (100%) rename spec/fixtures/packages/theme-with-syntax-variables/{stylesheets => styles}/editor.less (100%) rename spec/fixtures/packages/theme-with-ui-variables/{stylesheets => styles}/editor.less (100%) rename spec/fixtures/packages/theme-with-ui-variables/{stylesheets => styles}/ui-variables.less (100%) rename spec/fixtures/packages/theme-without-package-file/{stylesheets => styles}/a.css (100%) rename spec/fixtures/packages/theme-without-package-file/{stylesheets => styles}/b.css (100%) rename spec/fixtures/packages/theme-without-package-file/{stylesheets => styles}/c.less (100%) rename spec/fixtures/packages/theme-without-package-file/{stylesheets => styles}/d.csv (100%) diff --git a/spec/fixtures/packages/package-with-stylesheets-manifest/stylesheets/1.css b/spec/fixtures/packages/package-with-styles/styles/1.css similarity index 100% rename from spec/fixtures/packages/package-with-stylesheets-manifest/stylesheets/1.css rename to spec/fixtures/packages/package-with-styles/styles/1.css diff --git a/spec/fixtures/packages/package-with-stylesheets-manifest/stylesheets/2.less b/spec/fixtures/packages/package-with-styles/styles/2.less similarity index 100% rename from spec/fixtures/packages/package-with-stylesheets-manifest/stylesheets/2.less rename to spec/fixtures/packages/package-with-styles/styles/2.less diff --git a/spec/fixtures/packages/package-with-stylesheets/stylesheets/3.test-context.css b/spec/fixtures/packages/package-with-styles/styles/3.test-context.css similarity index 100% rename from spec/fixtures/packages/package-with-stylesheets/stylesheets/3.test-context.css rename to spec/fixtures/packages/package-with-styles/styles/3.test-context.css diff --git a/spec/fixtures/packages/package-with-stylesheets/stylesheets/4.css b/spec/fixtures/packages/package-with-styles/styles/4.css similarity index 100% rename from spec/fixtures/packages/package-with-stylesheets/stylesheets/4.css rename to spec/fixtures/packages/package-with-styles/styles/4.css diff --git a/spec/fixtures/packages/package-with-stylesheets/stylesheets/1.css b/spec/fixtures/packages/package-with-stylesheets-manifest/styles/1.css similarity index 100% rename from spec/fixtures/packages/package-with-stylesheets/stylesheets/1.css rename to spec/fixtures/packages/package-with-stylesheets-manifest/styles/1.css diff --git a/spec/fixtures/packages/package-with-stylesheets/stylesheets/2.less b/spec/fixtures/packages/package-with-stylesheets-manifest/styles/2.less similarity index 100% rename from spec/fixtures/packages/package-with-stylesheets/stylesheets/2.less rename to spec/fixtures/packages/package-with-stylesheets-manifest/styles/2.less diff --git a/spec/fixtures/packages/package-with-stylesheets-manifest/stylesheets/3.css b/spec/fixtures/packages/package-with-stylesheets-manifest/styles/3.css similarity index 100% rename from spec/fixtures/packages/package-with-stylesheets-manifest/stylesheets/3.css rename to spec/fixtures/packages/package-with-stylesheets-manifest/styles/3.css diff --git a/spec/fixtures/packages/theme-with-incomplete-ui-variables/stylesheets/editor.less b/spec/fixtures/packages/theme-with-incomplete-ui-variables/styles/editor.less similarity index 100% rename from spec/fixtures/packages/theme-with-incomplete-ui-variables/stylesheets/editor.less rename to spec/fixtures/packages/theme-with-incomplete-ui-variables/styles/editor.less diff --git a/spec/fixtures/packages/theme-with-incomplete-ui-variables/stylesheets/ui-variables.less b/spec/fixtures/packages/theme-with-incomplete-ui-variables/styles/ui-variables.less similarity index 100% rename from spec/fixtures/packages/theme-with-incomplete-ui-variables/stylesheets/ui-variables.less rename to spec/fixtures/packages/theme-with-incomplete-ui-variables/styles/ui-variables.less diff --git a/spec/fixtures/packages/theme-with-package-file/stylesheets/first.css b/spec/fixtures/packages/theme-with-package-file/styles/first.css similarity index 100% rename from spec/fixtures/packages/theme-with-package-file/stylesheets/first.css rename to spec/fixtures/packages/theme-with-package-file/styles/first.css diff --git a/spec/fixtures/packages/theme-with-package-file/stylesheets/last.css b/spec/fixtures/packages/theme-with-package-file/styles/last.css similarity index 100% rename from spec/fixtures/packages/theme-with-package-file/stylesheets/last.css rename to spec/fixtures/packages/theme-with-package-file/styles/last.css diff --git a/spec/fixtures/packages/theme-with-package-file/stylesheets/second.less b/spec/fixtures/packages/theme-with-package-file/styles/second.less similarity index 100% rename from spec/fixtures/packages/theme-with-package-file/stylesheets/second.less rename to spec/fixtures/packages/theme-with-package-file/styles/second.less diff --git a/spec/fixtures/packages/theme-with-syntax-variables/stylesheets/editor.less b/spec/fixtures/packages/theme-with-syntax-variables/styles/editor.less similarity index 100% rename from spec/fixtures/packages/theme-with-syntax-variables/stylesheets/editor.less rename to spec/fixtures/packages/theme-with-syntax-variables/styles/editor.less diff --git a/spec/fixtures/packages/theme-with-ui-variables/stylesheets/editor.less b/spec/fixtures/packages/theme-with-ui-variables/styles/editor.less similarity index 100% rename from spec/fixtures/packages/theme-with-ui-variables/stylesheets/editor.less rename to spec/fixtures/packages/theme-with-ui-variables/styles/editor.less diff --git a/spec/fixtures/packages/theme-with-ui-variables/stylesheets/ui-variables.less b/spec/fixtures/packages/theme-with-ui-variables/styles/ui-variables.less similarity index 100% rename from spec/fixtures/packages/theme-with-ui-variables/stylesheets/ui-variables.less rename to spec/fixtures/packages/theme-with-ui-variables/styles/ui-variables.less diff --git a/spec/fixtures/packages/theme-without-package-file/stylesheets/a.css b/spec/fixtures/packages/theme-without-package-file/styles/a.css similarity index 100% rename from spec/fixtures/packages/theme-without-package-file/stylesheets/a.css rename to spec/fixtures/packages/theme-without-package-file/styles/a.css diff --git a/spec/fixtures/packages/theme-without-package-file/stylesheets/b.css b/spec/fixtures/packages/theme-without-package-file/styles/b.css similarity index 100% rename from spec/fixtures/packages/theme-without-package-file/stylesheets/b.css rename to spec/fixtures/packages/theme-without-package-file/styles/b.css diff --git a/spec/fixtures/packages/theme-without-package-file/stylesheets/c.less b/spec/fixtures/packages/theme-without-package-file/styles/c.less similarity index 100% rename from spec/fixtures/packages/theme-without-package-file/stylesheets/c.less rename to spec/fixtures/packages/theme-without-package-file/styles/c.less diff --git a/spec/fixtures/packages/theme-without-package-file/stylesheets/d.csv b/spec/fixtures/packages/theme-without-package-file/styles/d.csv similarity index 100% rename from spec/fixtures/packages/theme-without-package-file/stylesheets/d.csv rename to spec/fixtures/packages/theme-without-package-file/styles/d.csv diff --git a/spec/package-manager-spec.coffee b/spec/package-manager-spec.coffee index 52ef023bd..c8906e976 100644 --- a/spec/package-manager-spec.coffee +++ b/spec/package-manager-spec.coffee @@ -354,9 +354,9 @@ describe "PackageManager", -> describe "stylesheet loading", -> describe "when the metadata contains a 'stylesheets' manifest", -> it "loads stylesheets from the stylesheets directory as specified by the manifest", -> - one = require.resolve("./fixtures/packages/package-with-stylesheets-manifest/stylesheets/1.css") - two = require.resolve("./fixtures/packages/package-with-stylesheets-manifest/stylesheets/2.less") - three = require.resolve("./fixtures/packages/package-with-stylesheets-manifest/stylesheets/3.css") + one = require.resolve("./fixtures/packages/package-with-stylesheets-manifest/styles/1.css") + two = require.resolve("./fixtures/packages/package-with-stylesheets-manifest/styles/2.less") + three = require.resolve("./fixtures/packages/package-with-stylesheets-manifest/styles/3.css") one = atom.themes.stringToId(one) two = atom.themes.stringToId(two) @@ -377,10 +377,10 @@ describe "PackageManager", -> describe "when the metadata does not contain a 'stylesheets' manifest", -> it "loads all stylesheets from the stylesheets directory", -> - one = require.resolve("./fixtures/packages/package-with-stylesheets/stylesheets/1.css") - two = require.resolve("./fixtures/packages/package-with-stylesheets/stylesheets/2.less") - three = require.resolve("./fixtures/packages/package-with-stylesheets/stylesheets/3.test-context.css") - four = require.resolve("./fixtures/packages/package-with-stylesheets/stylesheets/4.css") + one = require.resolve("./fixtures/packages/package-with-styles/styles/1.css") + two = require.resolve("./fixtures/packages/package-with-styles/styles/2.less") + three = require.resolve("./fixtures/packages/package-with-styles/styles/3.test-context.css") + four = require.resolve("./fixtures/packages/package-with-styles/styles/4.css") one = atom.themes.stringToId(one) two = atom.themes.stringToId(two) @@ -393,7 +393,7 @@ describe "PackageManager", -> expect(atom.themes.stylesheetElementForId(four)).toBeNull() waitsForPromise -> - atom.packages.activatePackage("package-with-stylesheets") + atom.packages.activatePackage("package-with-styles") runs -> expect(atom.themes.stylesheetElementForId(one)).not.toBeNull() @@ -404,7 +404,7 @@ describe "PackageManager", -> it "assigns the stylesheet's context based on the filename", -> waitsForPromise -> - atom.packages.activatePackage("package-with-stylesheets") + atom.packages.activatePackage("package-with-styles") runs -> count = 0 @@ -533,13 +533,13 @@ describe "PackageManager", -> it "removes the package's stylesheets", -> waitsForPromise -> - atom.packages.activatePackage('package-with-stylesheets') + atom.packages.activatePackage('package-with-styles') runs -> - atom.packages.deactivatePackage('package-with-stylesheets') - one = require.resolve("./fixtures/packages/package-with-stylesheets-manifest/stylesheets/1.css") - two = require.resolve("./fixtures/packages/package-with-stylesheets-manifest/stylesheets/2.less") - three = require.resolve("./fixtures/packages/package-with-stylesheets-manifest/stylesheets/3.css") + atom.packages.deactivatePackage('package-with-styles') + one = require.resolve("./fixtures/packages/package-with-stylesheets-manifest/styles/1.css") + two = require.resolve("./fixtures/packages/package-with-stylesheets-manifest/styles/2.less") + three = require.resolve("./fixtures/packages/package-with-stylesheets-manifest/styles/3.css") expect(atom.themes.stylesheetElementForId(one)).not.toExist() expect(atom.themes.stylesheetElementForId(two)).not.toExist() expect(atom.themes.stylesheetElementForId(three)).not.toExist()