From faa17d526371a34325705b8de9594e4e9df03298 Mon Sep 17 00:00:00 2001 From: Mike Greiling Date: Wed, 17 Jul 2019 17:17:37 -0500 Subject: Rename the karma:fixtures task Introduces frontend:fixtures rake task to replace karma:fixtures and update documentation and CI scripts to match --- spec/frontend/helpers/fixtures.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'spec/frontend/helpers/fixtures.js') diff --git a/spec/frontend/helpers/fixtures.js b/spec/frontend/helpers/fixtures.js index b77bcd6266e..09d91e963fd 100644 --- a/spec/frontend/helpers/fixtures.js +++ b/spec/frontend/helpers/fixtures.js @@ -9,7 +9,7 @@ export function getFixture(relativePath) { throw new ErrorWithStack( `Fixture file ${relativePath} does not exist. -Did you run bin/rake karma:fixtures?`, +Did you run bin/rake frontend:fixtures?`, getFixture, ); } -- cgit v1.2.1 From 89142f985deaff5cd60db0a95f05b646641f6f04 Mon Sep 17 00:00:00 2001 From: Mike Greiling Date: Wed, 17 Jul 2019 17:47:33 -0500 Subject: Move frontend fixtures to tmp/tests --- spec/frontend/helpers/fixtures.js | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) (limited to 'spec/frontend/helpers/fixtures.js') diff --git a/spec/frontend/helpers/fixtures.js b/spec/frontend/helpers/fixtures.js index 09d91e963fd..778196843db 100644 --- a/spec/frontend/helpers/fixtures.js +++ b/spec/frontend/helpers/fixtures.js @@ -4,7 +4,10 @@ import path from 'path'; import { ErrorWithStack } from 'jest-util'; export function getFixture(relativePath) { - const absolutePath = path.join(global.fixturesBasePath, relativePath); + const basePath = relativePath.startsWith('static/') + ? global.staticFixturesBasePath + : global.fixturesBasePath; + const absolutePath = path.join(basePath, relativePath); if (!fs.existsSync(absolutePath)) { throw new ErrorWithStack( `Fixture file ${relativePath} does not exist. -- cgit v1.2.1