From 58bb16f5e63044cecfe9aeb7dcff7f29489d5ec9 Mon Sep 17 00:00:00 2001 From: Matt Cooper Date: Mon, 24 Sep 2018 11:20:23 -0400 Subject: [PATCH 01/19] add Azure Pipelines for CI --- azure-pipelines.yml | 81 +++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 81 insertions(+) create mode 100644 azure-pipelines.yml diff --git a/azure-pipelines.yml b/azure-pipelines.yml new file mode 100644 index 000000000..3c2098b1c --- /dev/null +++ b/azure-pipelines.yml @@ -0,0 +1,81 @@ +trigger: +- master + +jobs: +- job: Windows + timeoutInMinutes: 120 + strategy: + matrix: + Node6: + nodejs_version: "6" + Node8: + nodejs_version: "8" + maxParallel: 2 + + pool: + vmImage: vs2017-win2016 + + steps: + - task: NodeTool@0 + inputs: + versionSpec: $(nodejs_version) + + - powershell: | + npm config set spin false + npm install + displayName: Install + + - powershell: | + node --version + npm --version + npm run test:bin -- --reporter=xunit --reporter-options output=results-bin.xml + npm run test:command -- --reporter=xunit --reporter-options output=results-command.xml + displayName: Test + continueOnError: true + + - task: PublishTestResults@2 + displayName: Publish Tests Results + inputs: + testResultsFiles: 'results-*.xml' + testResultsFormat: XUnit + searchFolder: '$(Build.SourcesDirectory)' + condition: succeededOrFailed() + +- job: Linux + timeoutInMinutes: 120 + strategy: + matrix: + Node6: + nodejs_version: "6" + Node8: + nodejs_version: "8" + maxParallel: 2 + + pool: + vmImage: ubuntu-16.04 + + steps: + - task: NodeTool@0 + inputs: + versionSpec: $(nodejs_version) + + - bash: | + npm config set spin false + npm install + displayName: Install + + - script: | + node --version + npm --version + npm run test:bin -- --reporter=xunit --reporter-options output=results-bin.xml + npm run test:command -- --reporter=xunit --reporter-options output=results-command.xml + displayName: Test + continueOnError: true + + - task: PublishTestResults@2 + displayName: Publish Tests Results + inputs: + testResultsFiles: 'results-*.xml' + testResultsFormat: XUnit + searchFolder: '$(Build.SourcesDirectory)' + condition: succeededOrFailed() From d045c695b6f0767db069d6fa88571da1debb4505 Mon Sep 17 00:00:00 2001 From: Matt Cooper Date: Tue, 25 Sep 2018 10:08:57 -0400 Subject: [PATCH 02/19] fixup timeouts --- azure-pipelines.yml | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/azure-pipelines.yml b/azure-pipelines.yml index 3c2098b1c..3a06fc5f8 100644 --- a/azure-pipelines.yml +++ b/azure-pipelines.yml @@ -3,7 +3,7 @@ trigger: jobs: - job: Windows - timeoutInMinutes: 120 + timeoutInMinutes: 360 strategy: matrix: Node6: @@ -42,7 +42,6 @@ jobs: condition: succeededOrFailed() - job: Linux - timeoutInMinutes: 120 strategy: matrix: Node6: From d5e1feb435f4027aff7e0353a9d89906522c3c46 Mon Sep 17 00:00:00 2001 From: Matt Cooper Date: Mon, 15 Oct 2018 15:06:13 -0400 Subject: [PATCH 03/19] try `call` syntax --- azure-pipelines.yml | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/azure-pipelines.yml b/azure-pipelines.yml index 3a06fc5f8..b4115a9ce 100644 --- a/azure-pipelines.yml +++ b/azure-pipelines.yml @@ -25,11 +25,11 @@ jobs: npm install displayName: Install - - powershell: | + - script: | node --version - npm --version - npm run test:bin -- --reporter=xunit --reporter-options output=results-bin.xml - npm run test:command -- --reporter=xunit --reporter-options output=results-command.xml + call npm --version + call npm run test:bin -- --reporter=xunit --reporter-options output=results-bin.xml + call npm run test:command -- --reporter=xunit --reporter-options output=results-command.xml displayName: Test continueOnError: true From f7d537d19dbcd5c8dc62cb6d6cd665b3e31fbf7a Mon Sep 17 00:00:00 2001 From: Matt Cooper Date: Tue, 16 Oct 2018 13:58:59 -0400 Subject: [PATCH 04/19] start bisecting tests --- azure-pipelines.yml | 76 ++++++++++++++++++++++++--------------------- 1 file changed, 40 insertions(+), 36 deletions(-) diff --git a/azure-pipelines.yml b/azure-pipelines.yml index b4115a9ce..f1af61225 100644 --- a/azure-pipelines.yml +++ b/azure-pipelines.yml @@ -3,11 +3,11 @@ trigger: jobs: - job: Windows - timeoutInMinutes: 360 + timeoutInMinutes: 15 strategy: matrix: - Node6: - nodejs_version: "6" + # Node6: + # nodejs_version: "6" Node8: nodejs_version: "8" maxParallel: 2 @@ -29,8 +29,12 @@ jobs: node --version call npm --version call npm run test:bin -- --reporter=xunit --reporter-options output=results-bin.xml + displayName: Test:bin + continueOnError: true + + - script: | call npm run test:command -- --reporter=xunit --reporter-options output=results-command.xml - displayName: Test + displayName: Test:command continueOnError: true - task: PublishTestResults@2 @@ -41,40 +45,40 @@ jobs: searchFolder: '$(Build.SourcesDirectory)' condition: succeededOrFailed() -- job: Linux - strategy: - matrix: - Node6: - nodejs_version: "6" - Node8: - nodejs_version: "8" - maxParallel: 2 +# - job: Linux +# strategy: +# matrix: +# Node6: +# nodejs_version: "6" +# Node8: +# nodejs_version: "8" +# maxParallel: 2 - pool: - vmImage: ubuntu-16.04 +# pool: +# vmImage: ubuntu-16.04 - steps: - - task: NodeTool@0 - inputs: - versionSpec: $(nodejs_version) +# steps: +# - task: NodeTool@0 +# inputs: +# versionSpec: $(nodejs_version) - - bash: | - npm config set spin false - npm install - displayName: Install +# - bash: | +# npm config set spin false +# npm install +# displayName: Install - - script: | - node --version - npm --version - npm run test:bin -- --reporter=xunit --reporter-options output=results-bin.xml - npm run test:command -- --reporter=xunit --reporter-options output=results-command.xml - displayName: Test - continueOnError: true +# - script: | +# node --version +# npm --version +# npm run test:bin -- --reporter=xunit --reporter-options output=results-bin.xml +# npm run test:command -- --reporter=xunit --reporter-options output=results-command.xml +# displayName: Test +# continueOnError: true - - task: PublishTestResults@2 - displayName: Publish Tests Results - inputs: - testResultsFiles: 'results-*.xml' - testResultsFormat: XUnit - searchFolder: '$(Build.SourcesDirectory)' - condition: succeededOrFailed() +# - task: PublishTestResults@2 +# displayName: Publish Tests Results +# inputs: +# testResultsFiles: 'results-*.xml' +# testResultsFormat: XUnit +# searchFolder: '$(Build.SourcesDirectory)' +# condition: succeededOrFailed() From 40aac0be0be35d27f042a8cb529f65d321d125a9 Mon Sep 17 00:00:00 2001 From: Matt Cooper Date: Tue, 16 Oct 2018 15:04:50 -0400 Subject: [PATCH 05/19] disabled test:bin --- azure-pipelines.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/azure-pipelines.yml b/azure-pipelines.yml index f1af61225..6676b7edb 100644 --- a/azure-pipelines.yml +++ b/azure-pipelines.yml @@ -31,6 +31,7 @@ jobs: call npm run test:bin -- --reporter=xunit --reporter-options output=results-bin.xml displayName: Test:bin continueOnError: true + enabled: false - script: | call npm run test:command -- --reporter=xunit --reporter-options output=results-command.xml From 193dc47407b461c5401e1a0016d2a51cab95c731 Mon Sep 17 00:00:00 2001 From: Matt Cooper Date: Thu, 18 Oct 2018 15:52:13 -0400 Subject: [PATCH 06/19] continue bisecting tests --- azure-pipelines.yml | 17 ++++++++++++++--- package.json | 3 +++ 2 files changed, 17 insertions(+), 3 deletions(-) diff --git a/azure-pipelines.yml b/azure-pipelines.yml index 6676b7edb..9c7275a35 100644 --- a/azure-pipelines.yml +++ b/azure-pipelines.yml @@ -29,13 +29,24 @@ jobs: node --version call npm --version call npm run test:bin -- --reporter=xunit --reporter-options output=results-bin.xml - displayName: Test:bin + call npm run test:command -- --reporter=xunit --reporter-options output=results-command.xml + displayName: Test continueOnError: true enabled: false - script: | - call npm run test:command -- --reporter=xunit --reporter-options output=results-command.xml - displayName: Test:command + call npm run test:acceptance -- --reporter=xunit --reporter-options output=results-acceptance.xml + displayName: Test:acceptance + continueOnError: true + + - script: | + call npm run test:integration -- --reporter=xunit --reporter-options output=results-integration.xml + displayName: Test:integration + continueOnError: true + + - script: | + call npm run test:unit -- --reporter=xunit --reporter-options output=results-unit.xml + displayName: Test:unit continueOnError: true - task: PublishTestResults@2 diff --git a/package.json b/package.json index 9930c8072..ada4deab5 100644 --- a/package.json +++ b/package.json @@ -7,6 +7,9 @@ "ember-cli-update": "bin/ember-cli-update.js" }, "scripts": { + "test:acceptance": "cross-env DEBUG=ember-cli-update,git-diff-apply,git-fixtures mocha \"test/acceptance/**/!(ember-addon)-test.js\"", + "test:integration": "cross-env DEBUG=ember-cli-update,git-diff-apply,git-fixtures mocha \"test/integration/**/!(ember-addon)-test.js\"", + "test:unit": "cross-env DEBUG=ember-cli-update,git-diff-apply,git-fixtures mocha \"test/unit/**/!(ember-addon)-test.js\"", "test": "npm run test:both", "test:both": "npm run test:bin && npm run test:command", "test:bin": "cross-env DEBUG=ember-cli-update,git-diff-apply,git-fixtures mocha \"test/!(fixtures)/**/!(ember-addon)-test.js\"", From 2bd3df1db1795646a9a4f4b7cd29393bb394c4b4 Mon Sep 17 00:00:00 2001 From: Matt Cooper Date: Thu, 18 Oct 2018 16:09:47 -0400 Subject: [PATCH 07/19] run integration tests first --- azure-pipelines.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/azure-pipelines.yml b/azure-pipelines.yml index 9c7275a35..13d20680c 100644 --- a/azure-pipelines.yml +++ b/azure-pipelines.yml @@ -38,6 +38,7 @@ jobs: call npm run test:acceptance -- --reporter=xunit --reporter-options output=results-acceptance.xml displayName: Test:acceptance continueOnError: true + enabled: false - script: | call npm run test:integration -- --reporter=xunit --reporter-options output=results-integration.xml From 5d85f13a18190d4ff006c85faee93997e8d36ef8 Mon Sep 17 00:00:00 2001 From: Matt Cooper Date: Thu, 18 Oct 2018 16:10:09 -0400 Subject: [PATCH 08/19] run unit tests only --- azure-pipelines.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/azure-pipelines.yml b/azure-pipelines.yml index 13d20680c..9fb4beed8 100644 --- a/azure-pipelines.yml +++ b/azure-pipelines.yml @@ -44,6 +44,7 @@ jobs: call npm run test:integration -- --reporter=xunit --reporter-options output=results-integration.xml displayName: Test:integration continueOnError: true + enabled: false - script: | call npm run test:unit -- --reporter=xunit --reporter-options output=results-unit.xml From e2491e7c7b991251a808ba927d8be8ee80c98276 Mon Sep 17 00:00:00 2001 From: Matt Cooper Date: Fri, 19 Oct 2018 09:48:25 -0400 Subject: [PATCH 09/19] try some stuff in the acceptance suite --- azure-pipelines.yml | 2 +- package.json | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/azure-pipelines.yml b/azure-pipelines.yml index 9fb4beed8..2e12e9cd9 100644 --- a/azure-pipelines.yml +++ b/azure-pipelines.yml @@ -38,7 +38,6 @@ jobs: call npm run test:acceptance -- --reporter=xunit --reporter-options output=results-acceptance.xml displayName: Test:acceptance continueOnError: true - enabled: false - script: | call npm run test:integration -- --reporter=xunit --reporter-options output=results-integration.xml @@ -50,6 +49,7 @@ jobs: call npm run test:unit -- --reporter=xunit --reporter-options output=results-unit.xml displayName: Test:unit continueOnError: true + enabled: false - task: PublishTestResults@2 displayName: Publish Tests Results diff --git a/package.json b/package.json index ada4deab5..657fcfa2f 100644 --- a/package.json +++ b/package.json @@ -7,7 +7,7 @@ "ember-cli-update": "bin/ember-cli-update.js" }, "scripts": { - "test:acceptance": "cross-env DEBUG=ember-cli-update,git-diff-apply,git-fixtures mocha \"test/acceptance/**/!(ember-addon)-test.js\"", + "test:acceptance": "cross-env DEBUG=ember-cli-update,git-diff-apply,git-fixtures mocha --bail --debug --exit \"test/acceptance/**/!(ember-addon)-test.js\"", "test:integration": "cross-env DEBUG=ember-cli-update,git-diff-apply,git-fixtures mocha \"test/integration/**/!(ember-addon)-test.js\"", "test:unit": "cross-env DEBUG=ember-cli-update,git-diff-apply,git-fixtures mocha \"test/unit/**/!(ember-addon)-test.js\"", "test": "npm run test:both", From 773fe79f68487eedadec0d09a0c937fac39657a7 Mon Sep 17 00:00:00 2001 From: Matt Cooper Date: Fri, 19 Oct 2018 10:01:50 -0400 Subject: [PATCH 10/19] switch to node --inspect --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index 657fcfa2f..a1ea2a56e 100644 --- a/package.json +++ b/package.json @@ -7,7 +7,7 @@ "ember-cli-update": "bin/ember-cli-update.js" }, "scripts": { - "test:acceptance": "cross-env DEBUG=ember-cli-update,git-diff-apply,git-fixtures mocha --bail --debug --exit \"test/acceptance/**/!(ember-addon)-test.js\"", + "test:acceptance": "cross-env DEBUG=ember-cli-update,git-diff-apply,git-fixtures mocha --bail --inspect --exit \"test/acceptance/**/!(ember-addon)-test.js\"", "test:integration": "cross-env DEBUG=ember-cli-update,git-diff-apply,git-fixtures mocha \"test/integration/**/!(ember-addon)-test.js\"", "test:unit": "cross-env DEBUG=ember-cli-update,git-diff-apply,git-fixtures mocha \"test/unit/**/!(ember-addon)-test.js\"", "test": "npm run test:both", From fea783051eab0017e03ff411dec44ff665101199 Mon Sep 17 00:00:00 2001 From: Matt Cooper Date: Mon, 22 Oct 2018 13:11:34 -0400 Subject: [PATCH 11/19] try putting temp on the faster disk --- test/helpers/build-tmp.js | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/test/helpers/build-tmp.js b/test/helpers/build-tmp.js index 96a58fd50..fd9f36982 100644 --- a/test/helpers/build-tmp.js +++ b/test/helpers/build-tmp.js @@ -17,7 +17,11 @@ module.exports = function({ subDir = '', npmInstall }) { - let tmpPath = tmp.dirSync().name; + if (process.env.AGENT_TEMPDIRECTORY) { + let tmpPath = tmp.dirSync(dir=process.env.AGENT_TEMPDIRECTORY).name; + } else { + let tmpPath = tmp.dirSync().name; + } gitInit({ cwd: tmpPath From 0df3f44c3230090fd36ffa4920b23fbe48498a6c Mon Sep 17 00:00:00 2001 From: Matt Cooper Date: Mon, 22 Oct 2018 13:17:33 -0400 Subject: [PATCH 12/19] try a different agent dir --- test/helpers/build-tmp.js | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/test/helpers/build-tmp.js b/test/helpers/build-tmp.js index fd9f36982..783f64d3c 100644 --- a/test/helpers/build-tmp.js +++ b/test/helpers/build-tmp.js @@ -17,8 +17,8 @@ module.exports = function({ subDir = '', npmInstall }) { - if (process.env.AGENT_TEMPDIRECTORY) { - let tmpPath = tmp.dirSync(dir=process.env.AGENT_TEMPDIRECTORY).name; + if (process.env.AGENT_BUILDDIRECTORY) { + let tmpPath = tmp.dirSync(dir=process.env.AGENT_BUILDDIRECTORY).name; } else { let tmpPath = tmp.dirSync().name; } From 6e4eba809c7b958b170cf32fda3d92ecf555b6c1 Mon Sep 17 00:00:00 2001 From: Matt Cooper Date: Mon, 22 Oct 2018 13:23:37 -0400 Subject: [PATCH 13/19] maybe it's my JS syntax --- test/helpers/build-tmp.js | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/test/helpers/build-tmp.js b/test/helpers/build-tmp.js index 783f64d3c..919cf32dd 100644 --- a/test/helpers/build-tmp.js +++ b/test/helpers/build-tmp.js @@ -17,8 +17,8 @@ module.exports = function({ subDir = '', npmInstall }) { - if (process.env.AGENT_BUILDDIRECTORY) { - let tmpPath = tmp.dirSync(dir=process.env.AGENT_BUILDDIRECTORY).name; + if (process.env.AGENT_TEMPDIRECTORY) { + let tmpPath = tmp.dirSync({ dir: process.env.AGENT_TEMPDIRECTORY }).name; } else { let tmpPath = tmp.dirSync().name; } From 61514e8523d079c2ef9f37c8e964c02af64b84a1 Mon Sep 17 00:00:00 2001 From: Matt Cooper Date: Mon, 22 Oct 2018 13:28:17 -0400 Subject: [PATCH 14/19] dump logs --- azure-pipelines.yml | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/azure-pipelines.yml b/azure-pipelines.yml index 2e12e9cd9..8456ed541 100644 --- a/azure-pipelines.yml +++ b/azure-pipelines.yml @@ -38,6 +38,11 @@ jobs: call npm run test:acceptance -- --reporter=xunit --reporter-options output=results-acceptance.xml displayName: Test:acceptance continueOnError: true + + - bash: | + cat C:\npm\cache\_logs\*.log + displayName: Show npm logs + continueOnError: true - script: | call npm run test:integration -- --reporter=xunit --reporter-options output=results-integration.xml From cdb8b0dfaccb1542f97e4e36fcb8ca24ef3ab3c0 Mon Sep 17 00:00:00 2001 From: Matt Cooper Date: Mon, 22 Oct 2018 13:28:58 -0400 Subject: [PATCH 15/19] use more --- azure-pipelines.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/azure-pipelines.yml b/azure-pipelines.yml index 8456ed541..bf2ad4cec 100644 --- a/azure-pipelines.yml +++ b/azure-pipelines.yml @@ -39,8 +39,8 @@ jobs: displayName: Test:acceptance continueOnError: true - - bash: | - cat C:\npm\cache\_logs\*.log + - script: | + more C:\npm\cache\_logs\*.log displayName: Show npm logs continueOnError: true From b02a761679c1e66fcb06f64a96921d118d97ac4e Mon Sep 17 00:00:00 2001 From: Matt Cooper Date: Mon, 22 Oct 2018 13:46:48 -0400 Subject: [PATCH 16/19] ... --- test/helpers/build-tmp.js | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/test/helpers/build-tmp.js b/test/helpers/build-tmp.js index 919cf32dd..17a33fcf7 100644 --- a/test/helpers/build-tmp.js +++ b/test/helpers/build-tmp.js @@ -17,9 +17,11 @@ module.exports = function({ subDir = '', npmInstall }) { - if (process.env.AGENT_TEMPDIRECTORY) { - let tmpPath = tmp.dirSync({ dir: process.env.AGENT_TEMPDIRECTORY }).name; + if (process.env.BUILD_BINARIESDIRECTORY) { + console.log("Detected Azure Pipelines, using Build.BinariesDirectory"); + let tmpPath = tmp.dirSync({ dir: process.env.BUILD_BINARIESDIRECTORY }).name; } else { + console.log("Not using Azure Pipelines..."); let tmpPath = tmp.dirSync().name; } From 6e5cf74da476254cdbde95c09ac5b505cd8052c4 Mon Sep 17 00:00:00 2001 From: Matt Cooper Date: Mon, 22 Oct 2018 13:56:06 -0400 Subject: [PATCH 17/19] d drive root --- test/helpers/build-tmp.js | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/test/helpers/build-tmp.js b/test/helpers/build-tmp.js index 17a33fcf7..bd6698d51 100644 --- a/test/helpers/build-tmp.js +++ b/test/helpers/build-tmp.js @@ -17,9 +17,9 @@ module.exports = function({ subDir = '', npmInstall }) { - if (process.env.BUILD_BINARIESDIRECTORY) { + if (process.env.TF_BUILD) { console.log("Detected Azure Pipelines, using Build.BinariesDirectory"); - let tmpPath = tmp.dirSync({ dir: process.env.BUILD_BINARIESDIRECTORY }).name; + let tmpPath = tmp.dirSync({ dir: "d:\\" }).name; } else { console.log("Not using Azure Pipelines..."); let tmpPath = tmp.dirSync().name; From abb4229b1c541519b627df53aaac20daf72bc2ce Mon Sep 17 00:00:00 2001 From: Matt Cooper Date: Mon, 22 Oct 2018 13:57:07 -0400 Subject: [PATCH 18/19] hello variable scope --- test/helpers/build-tmp.js | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/test/helpers/build-tmp.js b/test/helpers/build-tmp.js index bd6698d51..69991162c 100644 --- a/test/helpers/build-tmp.js +++ b/test/helpers/build-tmp.js @@ -17,12 +17,13 @@ module.exports = function({ subDir = '', npmInstall }) { - if (process.env.TF_BUILD) { - console.log("Detected Azure Pipelines, using Build.BinariesDirectory"); - let tmpPath = tmp.dirSync({ dir: "d:\\" }).name; + let tmpPath; + if (process.env.AGENT_TEMPDIRECTORY) { + console.log("Detected Azure Pipelines, using agent temp dir"); + tmpPath = tmp.dirSync({ dir: process.env.AGENT_TEMPDIRECTORY }).name; } else { console.log("Not using Azure Pipelines..."); - let tmpPath = tmp.dirSync().name; + tmpPath = tmp.dirSync().name; } gitInit({ From 559f73bf216c8609e69f911901847623b192e861 Mon Sep 17 00:00:00 2001 From: Matt Cooper Date: Tue, 23 Oct 2018 12:07:44 -0400 Subject: [PATCH 19/19] scope down tests --- test/acceptance/ember-cli-update-test.js | 136 +++++++++++------------ 1 file changed, 68 insertions(+), 68 deletions(-) diff --git a/test/acceptance/ember-cli-update-test.js b/test/acceptance/ember-cli-update-test.js index 6751a572d..3c13029e5 100644 --- a/test/acceptance/ember-cli-update-test.js +++ b/test/acceptance/ember-cli-update-test.js @@ -83,72 +83,72 @@ describe('Acceptance - ember-cli-update', function() { }); }); - it('updates addon', function() { - return merge({ - fixturesPath: 'test/fixtures/local/my-addon' - }).promise.then(({ - status - }) => { - fixtureCompare({ - mergeFixtures: 'test/fixtures/merge/my-addon' - }); - - assertNormalUpdate(status); - assertNoUnstaged(status); - }); - }); - - (shouldSkipCodemods ? it.skip : it)('runs codemods', function() { - this.timeout(5 * 60 * 1000); - - let { - ps, - promise - } = merge({ - fixturesPath: 'test/fixtures/merge/my-app', - runCodemods: true - }); - - ps.stdout.on('data', data => { - let str = data.toString(); - if (str.includes('These codemods apply to your project.')) { - ps.stdin.write('a\n'); - } - }); - - return promise.then(({ - status - }) => { - // file is indeterminent between OS's, so ignore - fs.removeSync(path.join(tmpPath, 'MODULE_REPORT.md')); - - let mergeFixtures = 'test/fixtures/codemod/latest-node/my-app'; - if (process.env.NODE_LTS) { - mergeFixtures = 'test/fixtures/codemod/min-node/my-app'; - } - - fixtureCompare({ - mergeFixtures - }); - - assertNoUnstaged(status); - assertCodemodRan(status); - }); - }); - - it('scopes to sub dir if run from there', function() { - return merge({ - fixturesPath: 'test/fixtures/local/my-app', - subDir: 'foo/bar' - }).promise.then(({ - status - }) => { - fixtureCompare({ - mergeFixtures: 'test/fixtures/merge/my-app' - }); - - assertNormalUpdate(status); - assertNoUnstaged(status); - }); - }); + // it('updates addon', function() { + // return merge({ + // fixturesPath: 'test/fixtures/local/my-addon' + // }).promise.then(({ + // status + // }) => { + // fixtureCompare({ + // mergeFixtures: 'test/fixtures/merge/my-addon' + // }); + + // assertNormalUpdate(status); + // assertNoUnstaged(status); + // }); + // }); + + // (shouldSkipCodemods ? it.skip : it)('runs codemods', function() { + // this.timeout(5 * 60 * 1000); + + // let { + // ps, + // promise + // } = merge({ + // fixturesPath: 'test/fixtures/merge/my-app', + // runCodemods: true + // }); + + // ps.stdout.on('data', data => { + // let str = data.toString(); + // if (str.includes('These codemods apply to your project.')) { + // ps.stdin.write('a\n'); + // } + // }); + + // return promise.then(({ + // status + // }) => { + // // file is indeterminent between OS's, so ignore + // fs.removeSync(path.join(tmpPath, 'MODULE_REPORT.md')); + + // let mergeFixtures = 'test/fixtures/codemod/latest-node/my-app'; + // if (process.env.NODE_LTS) { + // mergeFixtures = 'test/fixtures/codemod/min-node/my-app'; + // } + + // fixtureCompare({ + // mergeFixtures + // }); + + // assertNoUnstaged(status); + // assertCodemodRan(status); + // }); + // }); + + // it('scopes to sub dir if run from there', function() { + // return merge({ + // fixturesPath: 'test/fixtures/local/my-app', + // subDir: 'foo/bar' + // }).promise.then(({ + // status + // }) => { + // fixtureCompare({ + // mergeFixtures: 'test/fixtures/merge/my-app' + // }); + + // assertNormalUpdate(status); + // assertNoUnstaged(status); + // }); + // }); });