From c4c6794c0a3aaf203c162e1cb743208f4bf5e295 Mon Sep 17 00:00:00 2001 From: Dave Laird Date: Fri, 31 Jul 2020 07:54:32 -0700 Subject: [PATCH 1/2] moving asset-rewriting-test to basic app --- .../test/asset-rewriting-test.js | 31 ------------------- .../basic-app/test/asset-rewriting-test.js | 21 +++++++++++++ 2 files changed, 21 insertions(+), 31 deletions(-) delete mode 100644 packages/ember-cli-fastboot/test/asset-rewriting-test.js create mode 100644 test-packages/basic-app/test/asset-rewriting-test.js diff --git a/packages/ember-cli-fastboot/test/asset-rewriting-test.js b/packages/ember-cli-fastboot/test/asset-rewriting-test.js deleted file mode 100644 index 1f21486b7..000000000 --- a/packages/ember-cli-fastboot/test/asset-rewriting-test.js +++ /dev/null @@ -1,31 +0,0 @@ -'use strict'; - -const chai = require('chai'); -const expect = chai.expect; -chai.use(require('chai-fs')); -const AddonTestApp = require('ember-cli-addon-tests').AddonTestApp; -const glob = require('glob'); - -describe('rewriting HTML', function() { - this.timeout(400000); - - let app; - - before(function() { - app = new AddonTestApp(); - - return app.create('dummy'); - }); - - it('builds an index.html that points to the browser build', function() { - return app.runEmberCommand('build', '--environment=production') - .then(function() { - let appPath = glob.sync(app.filePath('dist/assets/dummy-*.js'))[0]; - let matches = appPath.match(/dist\/assets\/dummy-(.*).js/); - let appSHA = matches[1]; - - expect(app.filePath('dist/index.html')).to.have.content.that.match(new RegExp(appSHA)); - }); - }); - -}); diff --git a/test-packages/basic-app/test/asset-rewriting-test.js b/test-packages/basic-app/test/asset-rewriting-test.js new file mode 100644 index 000000000..a8a2458da --- /dev/null +++ b/test-packages/basic-app/test/asset-rewriting-test.js @@ -0,0 +1,21 @@ +const chai = require('chai'); +const expect = chai.expect; +const glob = require("glob"); +const execa = require("execa"); + +chai.use(require('chai-fs')); + +describe.only('rewriting HTML', function () { + this.timeout(50000); + + it('builds an index.html that points to the browser build', async function () { + + await execa("yarn", ["build", "--environment=production"]); + + let appPath = glob.sync('dist/assets/basic-app-*.js')[0]; + let matches = appPath.match(/dist\/assets\/basic-app-(.*).js/); + let appSHA = matches[1]; + + expect('dist/index.html').to.have.content.that.match(new RegExp(appSHA)); + }); +}); From 895e238b81eb84163631a5f372a6b284eff178e2 Mon Sep 17 00:00:00 2001 From: Dave Laird Date: Fri, 31 Jul 2020 08:04:50 -0700 Subject: [PATCH 2/2] bumped timeout: --- test-packages/basic-app/test/asset-rewriting-test.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/test-packages/basic-app/test/asset-rewriting-test.js b/test-packages/basic-app/test/asset-rewriting-test.js index a8a2458da..fbdbff33c 100644 --- a/test-packages/basic-app/test/asset-rewriting-test.js +++ b/test-packages/basic-app/test/asset-rewriting-test.js @@ -6,7 +6,7 @@ const execa = require("execa"); chai.use(require('chai-fs')); describe.only('rewriting HTML', function () { - this.timeout(50000); + this.timeout(100000); it('builds an index.html that points to the browser build', async function () {