Skip to content

Commit 019cd17

Browse files
jonathantnealjonathantneal
committed
Update AVA
- Update all tests, as they are now run relative to the package directory via avajs/ava#1074 - Update plugins.js, as AVA requires an assertion
1 parent 38f1946 commit 019cd17

File tree

13 files changed

+62
-59
lines changed

13 files changed

+62
-59
lines changed

‎package.json‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@
2525
"resolve": "^1.1.7"
2626
},
2727
"devDependencies": {
28-
"ava": "^0.16.0",
28+
"ava": "^0.19.1",
2929
"eslint": "^3.19.0",
3030
"eslint-config-i-am-meticulous": "^6.0.1",
3131
"eslint-plugin-import": "^2.2.0",

‎test/custom-resolve.js‎

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ import atImport from ".."
1414
test.serial("should accept file", t => {
1515
return compareFixtures(t, "custom-resolve-file", {
1616
resolve: () => {
17-
return path.resolve("fixtures/imports/custom-resolve-1.css")
17+
return path.resolve("test/fixtures/imports/custom-resolve-1.css")
1818
},
1919
})
2020
})
@@ -23,7 +23,7 @@ test.serial("should accept promised file", t => {
2323
return compareFixtures(t, "custom-resolve-file", {
2424
resolve: () => {
2525
return Promise.resolve(
26-
path.resolve("fixtures/imports/custom-resolve-1.css")
26+
path.resolve("test/fixtures/imports/custom-resolve-1.css")
2727
)
2828
},
2929
})
@@ -33,9 +33,9 @@ test.serial("should accept array of files", t => {
3333
return compareFixtures(t, "custom-resolve-array", {
3434
resolve: () => {
3535
return [
36-
path.resolve("fixtures/imports/custom-resolve-1.css"),
37-
path.resolve("fixtures/imports/custom-resolve-2.css"),
38-
path.resolve("fixtures/imports/custom-resolve-1.css"),
36+
path.resolve("test/fixtures/imports/custom-resolve-1.css"),
37+
path.resolve("test/fixtures/imports/custom-resolve-2.css"),
38+
path.resolve("test/fixtures/imports/custom-resolve-1.css"),
3939
]
4040
},
4141
})
@@ -45,9 +45,9 @@ test.serial("should accept promised array of files", t => {
4545
return compareFixtures(t, "custom-resolve-array", {
4646
resolve: () => {
4747
return Promise.resolve([
48-
path.resolve("fixtures/imports/custom-resolve-1.css"),
49-
path.resolve("fixtures/imports/custom-resolve-2.css"),
50-
path.resolve("fixtures/imports/custom-resolve-1.css"),
48+
path.resolve("test/fixtures/imports/custom-resolve-1.css"),
49+
path.resolve("test/fixtures/imports/custom-resolve-2.css"),
50+
path.resolve("test/fixtures/imports/custom-resolve-1.css"),
5151
])
5252
},
5353
})
@@ -62,11 +62,11 @@ test(
6262
return path.replace("foo", "imports/bar")
6363
},
6464
load: p => {
65-
t.is(p, path.resolve("fixtures/imports", "bar.css"))
65+
t.is(p, path.resolve("test/fixtures/imports", "bar.css"))
6666
return "/* comment */"
6767
},
6868
}))
69-
.process(`@import "foo.css";`, { from: "fixtures/custom-resolve-file" })
69+
.process(`@import "foo.css";`, { from: "test/fixtures/custom-resolve-file" })
7070
.then(result => {
7171
t.is(result.css, "/* comment */")
7272
})

‎test/fixtures/resolve-cwd.css‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,2 +1,2 @@
1-
@import "fixtures/imports/foo.css";
2-
@import "fixtures/imports/foo-recursive.css";
1+
@import "test/fixtures/imports/foo.css";
2+
@import "test/fixtures/imports/foo-recursive.css";

‎test/fixtures/resolve-local-modules.css‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
1-
@import "fixtures/imports/modules/simple";
2-
@import "fixtures/imports/modules/empty";
3-
@import "fixtures/imports/modules/style";
4-
@import "fixtures/imports/modules/main";
5-
@import "fixtures/imports/modules/main-js";
6-
@import "fixtures/imports/modules/main-style";
1+
@import "test/fixtures/imports/modules/simple";
2+
@import "test/fixtures/imports/modules/empty";
3+
@import "test/fixtures/imports/modules/style";
4+
@import "test/fixtures/imports/modules/main";
5+
@import "test/fixtures/imports/modules/main-js";
6+
@import "test/fixtures/imports/modules/main-style";

‎test/helpers/compare-fixtures-ext.js‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -10,18 +10,18 @@ var atImport = require("../..")
1010

1111
function read(name, ext) {
1212
if (!ext) ext = ".css"
13-
return fs.readFileSync("fixtures/" + name + ext, "utf8")
13+
return fs.readFileSync("test/fixtures/" + name + ext, "utf8")
1414
}
1515

1616
module.exports = function(t, name, ext, opts, postcssOpts, warnings) {
17-
opts = assign({ path: "fixtures/imports" }, opts)
17+
opts = assign({ path: "test/fixtures/imports" }, opts)
1818
return postcss(atImport(opts))
1919
.process(read(name, ext), postcssOpts || {})
2020
.then(function(result) {
2121
var actual = result.css
2222
var expected = read(name + ".expected")
2323
// handy thing: checkout actual in the *.actual.css file
24-
fs.writeFile("fixtures/" + name + ".actual.css", actual)
24+
fs.writeFile("test/fixtures/" + name + ".actual.css", actual)
2525
t.is(actual, expected)
2626
if (!warnings) {
2727
warnings = []

‎test/helpers/compare-fixtures.js‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -9,18 +9,18 @@ var postcss = require("postcss")
99
var atImport = require("../..")
1010

1111
function read(name) {
12-
return fs.readFileSync("fixtures/" + name + ".css", "utf8")
12+
return fs.readFileSync("test/fixtures/" + name + ".css", "utf8")
1313
}
1414

1515
module.exports = function(t, name, opts, postcssOpts, warnings) {
16-
opts = assign({ path: "fixtures/imports" }, opts)
16+
opts = assign({ path: "test/fixtures/imports" }, opts)
1717
return postcss(atImport(opts))
1818
.process(read(name), postcssOpts || {})
1919
.then(function(result) {
2020
var actual = result.css
2121
var expected = read(name + ".expected")
2222
// handy thing: checkout actual in the *.actual.css file
23-
fs.writeFile("fixtures/" + name + ".actual.css", actual)
23+
fs.writeFile("test/fixtures/" + name + ".actual.css", actual)
2424
t.is(actual, expected)
2525
if (!warnings) {
2626
warnings = []

‎test/import-events.js‎

Lines changed: 13 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -13,30 +13,30 @@ test("should have a callback that returns an object" +
1313
" containing imported files", t => {
1414
return postcss()
1515
.use(atImport({
16-
path: "fixtures/imports",
16+
path: "test/fixtures/imports",
1717
onImport: files => {
1818
t.deepEqual(
1919
files,
2020
[
21-
resolve("fixtures/media-import.css"),
22-
resolve("fixtures/imports/media-import-level-2.css"),
23-
resolve("fixtures/imports/media-import-level-3.css"),
21+
resolve("test/fixtures/media-import.css"),
22+
resolve("test/fixtures/imports/media-import-level-2.css"),
23+
resolve("test/fixtures/imports/media-import-level-3.css"),
2424
]
2525
)
2626
},
2727
}))
28-
.process(readFileSync("fixtures/media-import.css"), {
29-
from: "fixtures/media-import.css",
28+
.process(readFileSync("test/fixtures/media-import.css"), {
29+
from: "test/fixtures/media-import.css",
3030
})
3131
})
3232

3333
test("should add dependency message for each import", t => {
3434
return postcss()
3535
.use(atImport({
36-
path: "fixtures/imports",
36+
path: "test/fixtures/imports",
3737
}))
38-
.process(readFileSync("fixtures/media-import.css"), {
39-
from: "fixtures/media-import.css",
38+
.process(readFileSync("test/fixtures/media-import.css"), {
39+
from: "test/fixtures/media-import.css",
4040
})
4141
.then((result) => {
4242
var deps = result.messages.filter(
@@ -45,13 +45,13 @@ test("should add dependency message for each import", t => {
4545
var expected = [
4646
{
4747
type: "dependency",
48-
file: resolve("fixtures/imports/media-import-level-2.css"),
49-
parent: resolve("fixtures/media-import.css"),
48+
file: resolve("test/fixtures/imports/media-import-level-2.css"),
49+
parent: resolve("test/fixtures/media-import.css"),
5050
},
5151
{
5252
type: "dependency",
53-
file: resolve("fixtures/imports/media-import-level-3.css"),
54-
parent: resolve("fixtures/imports/media-import-level-2.css"),
53+
file: resolve("test/fixtures/imports/media-import-level-3.css"),
54+
parent: resolve("test/fixtures/imports/media-import-level-2.css"),
5555
},
5656
]
5757
t.deepEqual(deps, expected)

‎test/import.js‎

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -48,15 +48,15 @@ test("should not fail with only one absolute import", t => {
4848
test("should not fail with absolute and local import", t => {
4949
return postcss()
5050
.use(atImport())
51-
.process("@import url('http://');\n@import 'fixtures/imports/foo.css';")
51+
.process("@import url('http://');\n@import 'test/fixtures/imports/foo.css';")
5252
.then(result => {
5353
t.is(result.css, "@import url('http://');\nfoo{}")
5454
})
5555
})
5656

5757
test("should error when file not found", t => {
5858
t.plan(1)
59-
var file = "fixtures/imports/import-missing.css"
59+
var file = "test/fixtures/imports/import-missing.css"
6060
return postcss()
6161
.use(atImport())
6262
.process(readFileSync(file), { from: file })
@@ -68,8 +68,8 @@ test("should error when file not found", t => {
6868
test("should contain a correct sourcemap", t => {
6969
return postcss()
7070
.use(atImport())
71-
.process(readFileSync("sourcemap/in.css"), {
72-
from: "sourcemap/in.css",
71+
.process(readFileSync("test/sourcemap/in.css"), {
72+
from: "test/sourcemap/in.css",
7373
to: null,
7474
map: {
7575
inline: false,
@@ -78,15 +78,15 @@ test("should contain a correct sourcemap", t => {
7878
.then(result => {
7979
t.is(
8080
result.map.toString(),
81-
readFileSync("sourcemap/out.css.map", "utf8").trim()
81+
readFileSync("test/sourcemap/out.css.map", "utf8").trim()
8282
)
8383
})
8484
})
8585

8686
test("inlined @import should keep PostCSS AST references clean", t => {
8787
return postcss()
8888
.use(atImport())
89-
.process("@import 'fixtures/imports/foo.css';\nbar{}")
89+
.process("@import 'test/fixtures/imports/foo.css';\nbar{}")
9090
.then(result => {
9191
result.root.nodes.forEach(node => {
9292
t.is(result.root, node.parent)
@@ -96,9 +96,9 @@ test("inlined @import should keep PostCSS AST references clean", t => {
9696

9797
test("should work with empty files", t => {
9898
return compareFixtures(t, "empty-and-useless", {
99-
path: "fixtures/imports",
99+
path: "test/fixtures/imports",
100100
}, null, [
101-
path.resolve("fixtures/imports/empty.css") + " is empty",
101+
path.resolve("test/fixtures/imports/empty.css") + " is empty",
102102
])
103103
})
104104

‎test/lint.js‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -60,10 +60,10 @@ test("should warn if something before comments", t => {
6060
test("should not warn when @charset or @import statement before", t => {
6161
return Promise.all([
6262
processor.process(`@import "bar.css"; @import "bar.css";`, {
63-
from: "fixtures/imports/foo.css",
63+
from: "test/fixtures/imports/foo.css",
6464
}),
6565
processor.process(`@charset "bar.css"; @import "bar.css";`, {
66-
from: "fixtures/imports/foo.css",
66+
from: "test/fixtures/imports/foo.css",
6767
}),
6868
])
6969
.then(function(results) {

‎test/order.js‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -9,10 +9,10 @@ test(`should order nested imports correctly`, t => {
99
var path = require("path")
1010

1111
return compareFixtures(t, "order", {
12-
path: "fixtures/imports",
12+
path: "test/fixtures/imports",
1313
resolve: (id) => {
1414
return new Promise(function(res) {
15-
var doResolve = () => res(path.resolve("fixtures/imports", id))
15+
var doResolve = () => res(path.resolve("test/fixtures/imports", id))
1616

1717
if (first) {
1818
// Delay the first import so the second gets loaded first

0 commit comments

Comments
 (0)