From b633e226b17b0daa321789dcdde44376f33dfc54 Mon Sep 17 00:00:00 2001 From: Owen Buckley Date: Wed, 21 Apr 2021 08:04:05 -0400 Subject: [PATCH] initial upgrade of all specs to gallinago --- .github/CONTRIBUTING.md | 4 +- .../build.config.default.spec.js | 12 +- .../build.config.error-mode.spec.js | 21 +- .../build.config.error-optimization.spec.js | 21 +- .../build.config.error-title.spec.js | 19 +- ...ld.config.error-workspace-absolute.spec.js | 19 +- .../build.config.error-workspace.spec.js | 19 +- .../build.config.markdown-custom.spec.js | 21 +- ...ld.config.markdown-custom.settings.spec.js | 21 +- .../build.config.meta.spec.js | 20 +- .../build.config.mode-mpa.spec.js | 43 ++-- .../build.config-optimization-default.spec.js | 22 +- .../build.config-optimization-inline.spec.js | 18 +- .../build.config-optimization-none.spec.js | 22 +- .../build.config-optimization-static.spec.js | 18 +- .../build.config.title.spec.js | 20 +- .../build.config.workspace-custom.spec.js | 20 +- .../build.default.import-node-modules.spec.js | 240 +++++++++--------- .../build.default.markdown.spec.js | 19 +- .../build.default.quick-start-npx.spec.js | 21 +- .../build.default.workspace-assets.spec.js | 22 +- ....default.workspace-getting-started.spec.js | 22 +- ...lt.workspace-javascript-css-remote.spec.js | 24 +- ...d.default.workspace-javascript-css.spec.js | 24 +- .../build.default.workspace-nested.spec.js | 20 +- ...ild.default.workspace-template-app.spec.js | 20 +- ...lt.workspace-template-page-and-app.spec.js | 24 +- ...rkspace-template-page-bare-merging.spec.js | 22 +- ...ld.default.workspace-template-page.spec.js | 19 +- ....default.workspace-top-level-pages.spec.js | 22 +- ...t.workspace-user-directory-mapping.spec.js | 22 +- .../cases/build.default/build.default.spec.js | 22 +- .../build.plugins.error-name.spec.js | 19 +- .../build.plugins.error-provider.spec.js | 19 +- .../build.plugins.error-type.spec.js | 19 +- .../build.config.plugins-resource.spec.js | 20 +- .../cases/eject.default/eject.default.spec.js | 22 +- .../test/cases/default/default.spec.js | 18 +- .../options.extend-config.spec.js | 20 +- .../test/cases/default/default.spec.js | 19 +- .../error-analytics-id.spec.js | 21 +- .../option-anonymous/option-anonymous.spec.js | 23 +- .../query-children/query-children.spec.js | 119 ++++----- .../cases/query-config/query-config.spec.js | 58 +++-- .../query-custom-frontmatter.spec.js | 121 ++++----- .../cases/query-graph/query-graph.spec.js | 121 ++++----- .../test/cases/query-menu/query-menu.spec.js | 121 ++++----- .../test/cases/default/default.spec.js | 35 ++- .../test/cases/default/default.spec.js | 19 +- .../test/cases/default/default.spec.js | 38 +-- .../test/cases/default/default.spec.js | 18 +- .../options.extend-config.spec.js | 20 +- test/utils.js | 13 + 53 files changed, 1032 insertions(+), 734 deletions(-) diff --git a/.github/CONTRIBUTING.md b/.github/CONTRIBUTING.md index e02a3fe3f..f649b7977 100644 --- a/.github/CONTRIBUTING.md +++ b/.github/CONTRIBUTING.md @@ -128,8 +128,8 @@ $ yarn test Below are some tips to help with running / debugging tests: - `describe.only` / `it.only`: only runs this block - `xdescribe` / `xit`: dont run this block -- Uncomment `setup.teardownTestBed()` in a case to see the build output without it getting cleaned up post test run -- Use `new TestBed(true)` get debug output from Greenwood when running tests +- Uncomment `runner.teardown()` in a case to see the build output without it getting cleaned up post test run +- Use `new Runner(true)` get debug output from Greenwood when running tests > **PLEASE DO NOT COMMIT ANY OF THESE ABOVE CHANGES THOUGH** diff --git a/packages/cli/test/cases/build.config.default/build.config.default.spec.js b/packages/cli/test/cases/build.config.default/build.config.default.spec.js index 97b175bc8..5c33d8192 100644 --- a/packages/cli/test/cases/build.config.default/build.config.default.spec.js +++ b/packages/cli/test/cases/build.config.default/build.config.default.spec.js @@ -16,6 +16,7 @@ */ const path = require('path'); const runSmokeTest = require('../../../../../test/smoke-test'); +const { getSetupFiles } = require('../../../../../test/utils'); const Runner = require('gallinago').Runner; describe('Build Greenwood With: ', function() { @@ -24,7 +25,7 @@ describe('Build Greenwood With: ', function() { const outputPath = path.join(__dirname, 'output'); let runner; - before(async function() { + before(function() { this.context = { publicDir: path.join(outputPath, 'public') }; @@ -33,14 +34,7 @@ describe('Build Greenwood With: ', function() { describe(LABEL, function() { before(async function() { - await runner.setup(outputPath, [{ - source: path.join(process.cwd(), 'node_modules/@webcomponents/webcomponentsjs/webcomponents-bundle.js'), - destination: path.join(outputPath, 'node_modules/@webcomponents/webcomponentsjs/webcomponents-bundle.js') - }, { - source: path.join(process.cwd(), 'node_modules/es-module-shims/dist/es-module-shims.js'), - destination: path.join(outputPath, 'node_modules/es-module-shims/dist/es-module-shims.js') - }]); - + await runner.setup(outputPath, getSetupFiles(outputPath)); await runner.runCommand(cliPath, 'build'); }); diff --git a/packages/cli/test/cases/build.config.error-mode/build.config.error-mode.spec.js b/packages/cli/test/cases/build.config.error-mode/build.config.error-mode.spec.js index bd291dbe6..46753ffde 100644 --- a/packages/cli/test/cases/build.config.error-mode/build.config.error-mode.spec.js +++ b/packages/cli/test/cases/build.config.error-mode/build.config.error-mode.spec.js @@ -17,20 +17,27 @@ * Greenwood default */ const expect = require('chai').expect; -const TestBed = require('../../../../../test/test-bed'); +const path = require('path'); +const { getSetupFiles } = require('../../../../../test/utils'); +const Runner = require('gallinago').Runner; describe('Build Greenwood With: ', function() { - let setup; + const cliPath = path.join(process.cwd(), 'packages/cli/src/index.js'); + const outputPath = path.join(__dirname, 'output'); + let runner; - before(async function() { - setup = new TestBed(); - await setup.setupTestBed(__dirname); + before(function() { + this.context = { + publicDir: path.join(outputPath, 'public') + }; + runner = new Runner(); }); describe('Custom Configuration with a bad value for mode', function() { it('should throw an error that provided mode is not valid', async function() { try { - await setup.runGreenwoodCommand('build'); + await runner.setup(outputPath, getSetupFiles(outputPath)); + await runner.runCommand(cliPath, 'build'); } catch (err) { expect(err).to.contain('Error: provided mode "loremipsum" is not supported. Please use one of: ssg, mpa.'); } @@ -38,7 +45,7 @@ describe('Build Greenwood With: ', function() { }); after(function() { - setup.teardownTestBed(); + runner.teardown(); }); }); \ No newline at end of file diff --git a/packages/cli/test/cases/build.config.error-optimization/build.config.error-optimization.spec.js b/packages/cli/test/cases/build.config.error-optimization/build.config.error-optimization.spec.js index cfb4dbbe5..9cb1a4443 100644 --- a/packages/cli/test/cases/build.config.error-optimization/build.config.error-optimization.spec.js +++ b/packages/cli/test/cases/build.config.error-optimization/build.config.error-optimization.spec.js @@ -17,20 +17,27 @@ * Greenwood default */ const expect = require('chai').expect; -const TestBed = require('../../../../../test/test-bed'); +const path = require('path'); +const { getSetupFiles } = require('../../../../../test/utils'); +const Runner = require('gallinago').Runner; -describe('Build Greenwood With: ', function() { - let setup; +describe.only('Build Greenwood With: ', function() { + const cliPath = path.join(process.cwd(), 'packages/cli/src/index.js'); + const outputPath = path.join(__dirname, 'output'); + let runner; before(async function() { - setup = new TestBed(); - await setup.setupTestBed(__dirname); + this.context = { + publicDir: path.join(outputPath, 'public') + }; + runner = new Runner(); }); describe('Custom Configuration with a bad value for optimization', function() { it('should throw an error that provided optimization is not valid', async function() { try { - await setup.runGreenwoodCommand('build'); + await runner.setup(outputPath, getSetupFiles(outputPath)); + await runner.runCommand(cliPath, 'build'); } catch (err) { expect(err).to.contain('Error: provided optimization "loremipsum" is not supported. Please use one of: default, none, static, inline.'); } @@ -38,7 +45,7 @@ describe('Build Greenwood With: ', function() { }); after(function() { - setup.teardownTestBed(); + runner.teardown(); }); }); \ No newline at end of file diff --git a/packages/cli/test/cases/build.config.error-title/build.config.error-title.spec.js b/packages/cli/test/cases/build.config.error-title/build.config.error-title.spec.js index dabbf19e2..7ffd2553c 100644 --- a/packages/cli/test/cases/build.config.error-title/build.config.error-title.spec.js +++ b/packages/cli/test/cases/build.config.error-title/build.config.error-title.spec.js @@ -17,20 +17,27 @@ * Greenwood default */ const expect = require('chai').expect; -const TestBed = require('../../../../../test/test-bed'); +const path = require('path'); +const { getSetupFiles } = require('../../../../../test/utils'); +const Runner = require('gallinago').Runner; describe('Build Greenwood With: ', function() { - let setup; + const cliPath = path.join(process.cwd(), 'packages/cli/src/index.js'); + const outputPath = path.join(__dirname, 'output'); + let runner; before(async function() { - setup = new TestBed(); - await setup.setupTestBed(__dirname); + this.context = { + publicDir: path.join(outputPath, 'public') + }; + runner = new Runner(); }); describe('Custom Configuration with a bad value for Title', function() { it('should throw an error that title must be a string', async function() { try { - await setup.runGreenwoodCommand('build'); + await runner.setup(outputPath, getSetupFiles(outputPath)); + await runner.runCommand(cliPath, 'build'); } catch (err) { expect(err).to.contain('greenwood.config.js title must be a string'); } @@ -38,7 +45,7 @@ describe('Build Greenwood With: ', function() { }); after(function() { - setup.teardownTestBed(); + runner.teardown(); }); }); \ No newline at end of file diff --git a/packages/cli/test/cases/build.config.error-workspace-absolute/build.config.error-workspace-absolute.spec.js b/packages/cli/test/cases/build.config.error-workspace-absolute/build.config.error-workspace-absolute.spec.js index 2992a1fb1..58667d909 100644 --- a/packages/cli/test/cases/build.config.error-workspace-absolute/build.config.error-workspace-absolute.spec.js +++ b/packages/cli/test/cases/build.config.error-workspace-absolute/build.config.error-workspace-absolute.spec.js @@ -17,20 +17,27 @@ * Greenwood default */ const expect = require('chai').expect; -const TestBed = require('../../../../../test/test-bed'); +const path = require('path'); +const { getSetupFiles } = require('../../../../../test/utils'); +const Runner = require('gallinago').Runner; describe('Build Greenwood With: ', function() { - let setup; + const cliPath = path.join(process.cwd(), 'packages/cli/src/index.js'); + const outputPath = path.join(__dirname, 'output'); + let runner; before(async function() { - setup = new TestBed(); - await setup.setupTestBed(__dirname); + this.context = { + publicDir: path.join(outputPath, 'public') + }; + runner = new Runner(); }); describe('Custom Configuration with a bad value (absolute path) for Workspace', function() { it('should throw an error that workspace path must exist', async function() { try { - await setup.runGreenwoodCommand('build'); + await runner.setup(outputPath, getSetupFiles(outputPath)); + await runner.runCommand(cliPath, 'build'); } catch (err) { expect(err).to.contain('greenwood.config.js workspace doesn\'t exist!'); } @@ -38,7 +45,7 @@ describe('Build Greenwood With: ', function() { }); after(function() { - setup.teardownTestBed(); + runner.teardown(); }); }); \ No newline at end of file diff --git a/packages/cli/test/cases/build.config.error-workspace/build.config.error-workspace.spec.js b/packages/cli/test/cases/build.config.error-workspace/build.config.error-workspace.spec.js index b5faf8bd6..c9bd86295 100644 --- a/packages/cli/test/cases/build.config.error-workspace/build.config.error-workspace.spec.js +++ b/packages/cli/test/cases/build.config.error-workspace/build.config.error-workspace.spec.js @@ -17,20 +17,27 @@ * Greenwood default */ const expect = require('chai').expect; -const TestBed = require('../../../../../test/test-bed'); +const path = require('path'); +const { getSetupFiles } = require('../../../../../test/utils'); +const Runner = require('gallinago').Runner; describe('Build Greenwood With: ', function() { - let setup; + const cliPath = path.join(process.cwd(), 'packages/cli/src/index.js'); + const outputPath = path.join(__dirname, 'output'); + let runner; before(async function() { - setup = new TestBed(); - await setup.setupTestBed(__dirname); + this.context = { + publicDir: path.join(outputPath, 'public') + }; + runner = new Runner(); }); describe('Custom Configuration with a bad value for Workspace', function() { it('should throw an error that workspace path must be a string', async function() { try { - await setup.runGreenwoodCommand('build'); + await runner.setup(outputPath, getSetupFiles(outputPath)); + await runner.runCommand(cliPath, 'build'); } catch (err) { expect(err).to.contain('greenwood.config.js workspace path must be a string'); } @@ -38,7 +45,7 @@ describe('Build Greenwood With: ', function() { }); after(function() { - setup.teardownTestBed(); + runner.teardown(); }); }); \ No newline at end of file diff --git a/packages/cli/test/cases/build.config.markdown-custom.plugins/build.config.markdown-custom.spec.js b/packages/cli/test/cases/build.config.markdown-custom.plugins/build.config.markdown-custom.spec.js index 831473367..a825393ff 100644 --- a/packages/cli/test/cases/build.config.markdown-custom.plugins/build.config.markdown-custom.spec.js +++ b/packages/cli/test/cases/build.config.markdown-custom.plugins/build.config.markdown-custom.spec.js @@ -24,21 +24,26 @@ const { JSDOM } = require('jsdom'); const path = require('path'); const expect = require('chai').expect; const runSmokeTest = require('../../../../../test/smoke-test'); -const TestBed = require('../../../../../test/test-bed'); +const { getSetupFiles } = require('../../../../../test/utils'); +const Runner = require('gallinago').Runner; describe('Build Greenwood With: ', function() { const LABEL = 'Custom Markdown Configuration and Default Workspace'; - let setup; + const cliPath = path.join(process.cwd(), 'packages/cli/src/index.js'); + const outputPath = path.join(__dirname, 'output'); + let runner; - before(async function() { - setup = new TestBed(); - - this.context = await setup.setupTestBed(__dirname); + before(function() { + this.context = { + publicDir: path.join(outputPath, 'public') + }; + runner = new Runner(); }); describe(LABEL, function() { before(async function() { - await setup.runGreenwoodCommand('build'); + await runner.setup(outputPath, getSetupFiles(outputPath)); + await runner.runCommand(cliPath, 'build'); }); runSmokeTest(['public', 'index'], LABEL); @@ -77,7 +82,7 @@ describe('Build Greenwood With: ', function() { }); after(function() { - setup.teardownTestBed(); + runner.teardown(); }); }); \ No newline at end of file diff --git a/packages/cli/test/cases/build.config.markdown-custom.settings/build.config.markdown-custom.settings.spec.js b/packages/cli/test/cases/build.config.markdown-custom.settings/build.config.markdown-custom.settings.spec.js index eaffca661..5fe7652d8 100644 --- a/packages/cli/test/cases/build.config.markdown-custom.settings/build.config.markdown-custom.settings.spec.js +++ b/packages/cli/test/cases/build.config.markdown-custom.settings/build.config.markdown-custom.settings.spec.js @@ -19,24 +19,29 @@ * index.md */ const { JSDOM } = require('jsdom'); -const path = require('path'); const expect = require('chai').expect; -const TestBed = require('../../../../../test/test-bed'); +const path = require('path'); +const { getSetupFiles } = require('../../../../../test/utils'); +const Runner = require('gallinago').Runner; describe('Build Greenwood With: ', function() { const LABEL = 'Custom Markdown Configuration and Custom Workspace'; - let setup; + const cliPath = path.join(process.cwd(), 'packages/cli/src/index.js'); + const outputPath = path.join(__dirname, 'output'); + let runner; before(async function() { - setup = new TestBed(); - - this.context = await setup.setupTestBed(__dirname); + this.context = { + publicDir: path.join(outputPath, 'public') + }; + runner = new Runner(); }); describe(LABEL, function() { before(async function() { - await setup.runGreenwoodCommand('build'); + await runner.setup(outputPath, getSetupFiles(outputPath)); + await runner.runCommand(cliPath, 'build'); }); describe('Custom Markdown Presets', function() { @@ -58,7 +63,7 @@ describe('Build Greenwood With: ', function() { }); after(function() { - setup.teardownTestBed(); + runner.teardown(); }); }); \ No newline at end of file diff --git a/packages/cli/test/cases/build.config.meta/build.config.meta.spec.js b/packages/cli/test/cases/build.config.meta/build.config.meta.spec.js index ff99f4bc1..5ffd7a67a 100644 --- a/packages/cli/test/cases/build.config.meta/build.config.meta.spec.js +++ b/packages/cli/test/cases/build.config.meta/build.config.meta.spec.js @@ -35,16 +35,21 @@ const { JSDOM } = require('jsdom'); const path = require('path'); const expect = require('chai').expect; const runSmokeTest = require('../../../../../test/smoke-test'); -const TestBed = require('../../../../../test/test-bed'); +const { getSetupFiles } = require('../../../../../test/utils'); +const Runner = require('gallinago').Runner; describe('Build Greenwood With: ', function() { const LABEL = 'Custom Meta Configuration and Nested Workspace'; const meta = greenwoodConfig.meta; - let setup; + const cliPath = path.join(process.cwd(), 'packages/cli/src/index.js'); + const outputPath = path.join(__dirname, 'output'); + let runner; - before(async function() { - setup = new TestBed(); - this.context = await setup.setupTestBed(__dirname); + before(function() { + this.context = { + publicDir: path.join(outputPath, 'public') + }; + runner = new Runner(); }); describe(LABEL, function() { @@ -57,7 +62,8 @@ describe('Build Greenwood With: ', function() { }; before(async function() { - await setup.runGreenwoodCommand('build'); + await runner.setup(outputPath, getSetupFiles(outputPath)); + await runner.runCommand(cliPath, 'build'); }); runSmokeTest(['public', 'index'], LABEL); @@ -168,7 +174,7 @@ describe('Build Greenwood With: ', function() { }); after(function() { - setup.teardownTestBed(); + runner.teardown(); }); }); \ No newline at end of file diff --git a/packages/cli/test/cases/build.config.mode-mpa/build.config.mode-mpa.spec.js b/packages/cli/test/cases/build.config.mode-mpa/build.config.mode-mpa.spec.js index 63e6439d6..42c86e072 100644 --- a/packages/cli/test/cases/build.config.mode-mpa/build.config.mode-mpa.spec.js +++ b/packages/cli/test/cases/build.config.mode-mpa/build.config.mode-mpa.spec.js @@ -25,31 +25,36 @@ const fs = require('fs'); const glob = require('glob-promise'); const { JSDOM } = require('jsdom'); const path = require('path'); -const TestBed = require('../../../../../test/test-bed'); +const { getSetupFiles } = require('../../../../../test/utils'); +const Runner = require('gallinago').Runner; -describe('Build Greenwood With: ', function() { +describe('Build Greenwood With: ', async function() { const LABEL = 'Custom Mode'; - let setup; - - before(async function() { - setup = new TestBed(); - - const greenwoodRouterLibs = (await glob(`${process.cwd()}/packages/cli/src/lib/router.js`)).map((lib) => { - return { - dir: 'node_modules/@greenwood/cli/src/lib/', - name: path.basename(lib) - }; - }); - - this.context = await setup.setupTestBed(__dirname, [ - ...greenwoodRouterLibs - ]); + const greenwoodRouterLibs = (await glob(`${process.cwd()}/packages/cli/src/lib/router.js`)).map((lib) => { + return { + dir: 'node_modules/@greenwood/cli/src/lib/', + name: path.basename(lib) + }; + }); + const cliPath = path.join(process.cwd(), 'packages/cli/src/index.js'); + const outputPath = path.join(__dirname, 'output'); + let runner; + + before(function() { + this.context = { + publicDir: path.join(outputPath, 'public') + }; + runner = new Runner(); }); describe(LABEL, function() { before(async function() { - await setup.runGreenwoodCommand('build'); + await runner.setup(outputPath, [ + ...getSetupFiles(outputPath), + ...greenwoodRouterLibs + ]); + await runner.runCommand(cliPath, 'build'); }); describe('MPA (Multi Page Application)', function() { @@ -143,7 +148,7 @@ describe('Build Greenwood With: ', function() { }); after(function() { - setup.teardownTestBed(); + runner.teardown(); }); }); \ No newline at end of file diff --git a/packages/cli/test/cases/build.config.optimization-default/build.config-optimization-default.spec.js b/packages/cli/test/cases/build.config.optimization-default/build.config-optimization-default.spec.js index 12f459a87..44baf25d3 100644 --- a/packages/cli/test/cases/build.config.optimization-default/build.config-optimization-default.spec.js +++ b/packages/cli/test/cases/build.config.optimization-default/build.config-optimization-default.spec.js @@ -23,21 +23,27 @@ const expect = require('chai').expect; const glob = require('glob-promise'); const { JSDOM } = require('jsdom'); const path = require('path'); -const TestBed = require('../../../../../test/test-bed'); +const { getSetupFiles } = require('../../../../../test/utils'); +const Runner = require('gallinago').Runner; describe('Build Greenwood With: ', function() { const LABEL = 'Default Optimization Configuration'; - let setup; - - before(async function() { - setup = new TestBed(); - this.context = await setup.setupTestBed(__dirname); + const cliPath = path.join(process.cwd(), 'packages/cli/src/index.js'); + const outputPath = path.join(__dirname, 'output'); + let runner; + + before(function() { + this.context = { + publicDir: path.join(outputPath, 'public') + }; + runner = new Runner(); }); describe(LABEL, function() { before(async function() { - await setup.runGreenwoodCommand('build'); + await runner.setup(outputPath, getSetupFiles(outputPath)); + await runner.runCommand(cliPath, 'build'); }); describe('Output for JavaScript / CSS tags and files', function() { @@ -102,6 +108,6 @@ describe('Build Greenwood With: ', function() { }); after(function() { - setup.teardownTestBed(); + runner.teardown(); }); }); \ No newline at end of file diff --git a/packages/cli/test/cases/build.config.optimization-inline/build.config-optimization-inline.spec.js b/packages/cli/test/cases/build.config.optimization-inline/build.config-optimization-inline.spec.js index a25c748ce..34b2c533b 100644 --- a/packages/cli/test/cases/build.config.optimization-inline/build.config-optimization-inline.spec.js +++ b/packages/cli/test/cases/build.config.optimization-inline/build.config-optimization-inline.spec.js @@ -26,21 +26,27 @@ const expect = require('chai').expect; const glob = require('glob-promise'); const { JSDOM } = require('jsdom'); const path = require('path'); -const TestBed = require('../../../../../test/test-bed'); +const { getSetupFiles } = require('../../../../../test/utils'); +const Runner = require('gallinago').Runner; describe('Build Greenwood With: ', function() { const LABEL = 'Inline Optimization Configuration'; - let setup; + const cliPath = path.join(process.cwd(), 'packages/cli/src/index.js'); + const outputPath = path.join(__dirname, 'output'); + let runner; before(async function() { - setup = new TestBed(); - this.context = await setup.setupTestBed(__dirname); + this.context = { + publicDir: path.join(outputPath, 'public') + }; + runner = new Runner(); }); describe(LABEL, function() { before(async function() { - await setup.runGreenwoodCommand('build'); + await runner.setup(outputPath, getSetupFiles(outputPath)); + await runner.runCommand(cliPath, 'build'); }); describe('Output for JavaScript / CSS tags and files', function() { @@ -110,6 +116,6 @@ describe('Build Greenwood With: ', function() { }); after(function() { - setup.teardownTestBed(); + runner.teardown(); }); }); \ No newline at end of file diff --git a/packages/cli/test/cases/build.config.optimization-none/build.config-optimization-none.spec.js b/packages/cli/test/cases/build.config.optimization-none/build.config-optimization-none.spec.js index a4e957f51..cd0cc57bc 100644 --- a/packages/cli/test/cases/build.config.optimization-none/build.config-optimization-none.spec.js +++ b/packages/cli/test/cases/build.config.optimization-none/build.config-optimization-none.spec.js @@ -27,21 +27,27 @@ const fs = require('fs'); const glob = require('glob-promise'); const { JSDOM } = require('jsdom'); const path = require('path'); -const TestBed = require('../../../../../test/test-bed'); +const { getSetupFiles } = require('../../../../../test/utils'); +const Runner = require('gallinago').Runner; describe('Build Greenwood With: ', function() { const LABEL = 'None Optimization Configuration'; - let setup; - - before(async function() { - setup = new TestBed(); - this.context = await setup.setupTestBed(__dirname); + const cliPath = path.join(process.cwd(), 'packages/cli/src/index.js'); + const outputPath = path.join(__dirname, 'output'); + let runner; + + before(function() { + this.context = { + publicDir: path.join(outputPath, 'public') + }; + runner = new Runner(); }); describe(LABEL, function() { before(async function() { - await setup.runGreenwoodCommand('build'); + await runner.setup(outputPath, getSetupFiles(outputPath)); + await runner.runCommand(cliPath, 'build'); }); describe('Output for JavaScript / CSS tags and files', function() { @@ -108,6 +114,6 @@ describe('Build Greenwood With: ', function() { }); after(function() { - setup.teardownTestBed(); + runner.teardown(); }); }); \ No newline at end of file diff --git a/packages/cli/test/cases/build.config.optimization-static/build.config-optimization-static.spec.js b/packages/cli/test/cases/build.config.optimization-static/build.config-optimization-static.spec.js index f9cae7bbc..391fdef8d 100644 --- a/packages/cli/test/cases/build.config.optimization-static/build.config-optimization-static.spec.js +++ b/packages/cli/test/cases/build.config.optimization-static/build.config-optimization-static.spec.js @@ -24,21 +24,27 @@ const expect = require('chai').expect; const glob = require('glob-promise'); const { JSDOM } = require('jsdom'); const path = require('path'); -const TestBed = require('../../../../../test/test-bed'); +const { getSetupFiles } = require('../../../../../test/utils'); +const Runner = require('gallinago').Runner; describe('Build Greenwood With: ', function() { const LABEL = 'Static Optimization Configuration'; - let setup; + const cliPath = path.join(process.cwd(), 'packages/cli/src/index.js'); + const outputPath = path.join(__dirname, 'output'); + let runner; before(async function() { - setup = new TestBed(); - this.context = await setup.setupTestBed(__dirname); + this.context = { + publicDir: path.join(outputPath, 'public') + }; + runner = new Runner(); }); describe(LABEL, function() { before(async function() { - await setup.runGreenwoodCommand('build'); + await runner.setup(outputPath, getSetupFiles(outputPath)); + await runner.runCommand(cliPath, 'build'); }); describe('JavaScript