From 5c9ed396d5fe1f0c17e34d7c4939e8874b973e3c Mon Sep 17 00:00:00 2001 From: Antoine Lehurt Date: Wed, 26 Feb 2014 10:59:07 +0100 Subject: [PATCH] Improve test for imported component Test mixin, placeholder selector, variable, function --- test/component-stylus.js | 2 +- test/fixtures/utils/component.json | 5 ++++- test/fixtures/utils/function.styl | 3 +++ test/fixtures/utils/index.styl | 3 --- test/fixtures/utils/mixin.styl | 3 +++ test/fixtures/utils/placeholder.styl | 3 +++ test/fixtures/utils/variable.styl | 1 + test/fixtures/with-import/index.styl | 18 +++++++++++------- 8 files changed, 26 insertions(+), 12 deletions(-) create mode 100644 test/fixtures/utils/function.styl delete mode 100644 test/fixtures/utils/index.styl create mode 100644 test/fixtures/utils/mixin.styl create mode 100644 test/fixtures/utils/placeholder.styl create mode 100644 test/fixtures/utils/variable.styl diff --git a/test/component-stylus.js b/test/component-stylus.js index dd3027f..592f23b 100644 --- a/test/component-stylus.js +++ b/test/component-stylus.js @@ -43,7 +43,7 @@ describe('component-stylus', function() { builder.build(function(err, res) { if (err) return done(err); - assert.equal(res.css.trim(), 'body {\n content: "test";\n color: #f00;\n}\nbody div {\n display: block;\n}'); + assert.equal(res.css.trim(), '.bar,\n#barz {\n content: "foo";\n}\n.bar {\n content: "mixin";\n font-size: 24px;\n}'); done(); }); }); diff --git a/test/fixtures/utils/component.json b/test/fixtures/utils/component.json index 5b54896..e8a618e 100644 --- a/test/fixtures/utils/component.json +++ b/test/fixtures/utils/component.json @@ -1,6 +1,9 @@ { "name": "utils", "styles": [ - "index.styl" + "mixin.styl", + "variable.styl", + "placeholder.styl", + "function.styl" ] } diff --git a/test/fixtures/utils/function.styl b/test/fixtures/utils/function.styl new file mode 100644 index 0000000..eda7a1e --- /dev/null +++ b/test/fixtures/utils/function.styl @@ -0,0 +1,3 @@ +add(a, b) { + a + b; +} diff --git a/test/fixtures/utils/index.styl b/test/fixtures/utils/index.styl deleted file mode 100644 index eb91452..0000000 --- a/test/fixtures/utils/index.styl +++ /dev/null @@ -1,3 +0,0 @@ -test() { - content: "test"; -} diff --git a/test/fixtures/utils/mixin.styl b/test/fixtures/utils/mixin.styl new file mode 100644 index 0000000..08c6f49 --- /dev/null +++ b/test/fixtures/utils/mixin.styl @@ -0,0 +1,3 @@ +mixin() { + content: "mixin"; +} diff --git a/test/fixtures/utils/placeholder.styl b/test/fixtures/utils/placeholder.styl new file mode 100644 index 0000000..b3b1bda --- /dev/null +++ b/test/fixtures/utils/placeholder.styl @@ -0,0 +1,3 @@ +$foo { + content: "foo"; +} diff --git a/test/fixtures/utils/variable.styl b/test/fixtures/utils/variable.styl new file mode 100644 index 0000000..165e370 --- /dev/null +++ b/test/fixtures/utils/variable.styl @@ -0,0 +1 @@ +font-size = 14px; diff --git a/test/fixtures/with-import/index.styl b/test/fixtures/with-import/index.styl index 8f1bf59..f0635cf 100644 --- a/test/fixtures/with-import/index.styl +++ b/test/fixtures/with-import/index.styl @@ -1,10 +1,14 @@ -@import "utils/index"; +@import "utils/mixin"; +@import "utils/placeholder"; +@import "utils/function"; +@import "utils/variable"; -body { - test(); - color: red; +.bar { + @extend $foo; + mixin(); + font-size: add(font-size, 10); +} - div { - display: block; - } +#barz { + @extend $foo; }