diff --git a/package-lock.json b/package-lock.json index d489a5c..51cdd83 100644 --- a/package-lock.json +++ b/package-lock.json @@ -2917,9 +2917,9 @@ } }, "@travi/javascript-scaffolder": { - "version": "4.5.0-alpha.2", - "resolved": "https://registry.npmjs.org/@travi/javascript-scaffolder/-/javascript-scaffolder-4.5.0-alpha.2.tgz", - "integrity": "sha512-0pQPo6k3AHPynD7YRpYAeTnwwWt/+h9hawXNhuytnBQhahY6rVXlegyTJq69JRKQD9ZO1OlSSuyPx1sOHniDsA==", + "version": "4.6.0-alpha.1", + "resolved": "https://registry.npmjs.org/@travi/javascript-scaffolder/-/javascript-scaffolder-4.6.0-alpha.1.tgz", + "integrity": "sha512-No71mLIZIWZ4JKZ+h7Knrxc7jEfQd/jtPXrZIJjOa8ckAwqH5yZgvsVcS89fpVzwdDf8t9YyZcei9iMqI2CLdQ==", "requires": { "chalk": "^2.4.1", "hoek": "^6.0.0", @@ -3047,9 +3047,9 @@ } }, "@travi/project-scaffolder": { - "version": "5.2.3", - "resolved": "https://registry.npmjs.org/@travi/project-scaffolder/-/project-scaffolder-5.2.3.tgz", - "integrity": "sha512-0AsJpKVSxZ3qJikS7YFPYMmqkn8gUmTH134oCzpNvC8m+STlEAkmOje2lVUGE58S8bT16Ln2yn/6AbEogffkVg==", + "version": "6.0.0-beta.1", + "resolved": "https://registry.npmjs.org/@travi/project-scaffolder/-/project-scaffolder-6.0.0-beta.1.tgz", + "integrity": "sha512-sKUfWRu1o1kCccweyK4VXXNfpoQY1WiqOUOXHiFTqt+ehkfO3pTk8zAGxFA0Nl4Eh9MHMp6sKYX2KhBPJzpp8g==", "requires": { "chalk": "^2.4.1", "hoek": "^6.0.0", @@ -3096,11 +3096,6 @@ "tmp": "^0.0.33" } }, - "hoek": { - "version": "6.1.2", - "resolved": "https://registry.npmjs.org/hoek/-/hoek-6.1.2.tgz", - "integrity": "sha512-6qhh/wahGYZHFSFw12tBbJw5fsAhhwrrG/y3Cs0YMTv2WzMnL0oLPnQJjv1QJvEfylRSOFuP+xCu+tdx0tD16Q==" - }, "inquirer": { "version": "6.2.2", "resolved": "https://registry.npmjs.org/inquirer/-/inquirer-6.2.2.tgz", @@ -3566,7 +3561,7 @@ }, "bl": { "version": "1.2.2", - "resolved": "http://registry.npmjs.org/bl/-/bl-1.2.2.tgz", + "resolved": "https://registry.npmjs.org/bl/-/bl-1.2.2.tgz", "integrity": "sha512-e8tQYnZodmebYDWGH7KMRvtzKXaJHx3BbilrgZCfvyLUYdKpK1t5PSPmpkny/SgiTSCnjfLW7v5rlONXVFkQEA==", "requires": { "readable-stream": "^2.3.5", @@ -5412,9 +5407,9 @@ "dev": true }, "hoek": { - "version": "5.0.4", - "resolved": "https://registry.npmjs.org/hoek/-/hoek-5.0.4.tgz", - "integrity": "sha512-Alr4ZQgoMlnere5FZJsIyfIjORBqZll5POhDsF4q64dPuJR6rNxXdDxtHSQq8OXRurhmx+PWYEE8bXRROY8h0w==" + "version": "6.1.2", + "resolved": "https://registry.npmjs.org/hoek/-/hoek-6.1.2.tgz", + "integrity": "sha512-6qhh/wahGYZHFSFw12tBbJw5fsAhhwrrG/y3Cs0YMTv2WzMnL0oLPnQJjv1QJvEfylRSOFuP+xCu+tdx0tD16Q==" }, "home-or-tmp": { "version": "3.0.0", @@ -5868,13 +5863,20 @@ } }, "joi": { - "version": "14.0.0", - "resolved": "https://registry.npmjs.org/joi/-/joi-14.0.0.tgz", - "integrity": "sha512-jEu+bPFcsgdPr85hVyjb5D5grxLEZniT6AB1vjewrRDbuYxe2r5quyxs3E32dF8fCXcaJnlRSy4jehSpDuNMNg==", + "version": "14.3.1", + "resolved": "https://registry.npmjs.org/joi/-/joi-14.3.1.tgz", + "integrity": "sha512-LQDdM+pkOrpAn4Lp+neNIFV3axv1Vna3j38bisbQhETPMANYRbFJFUyOZcOClYvM/hppMhGWuKSFEK9vjrB+bQ==", "requires": { - "hoek": "5.x.x", + "hoek": "6.x.x", "isemail": "3.x.x", "topo": "3.x.x" + }, + "dependencies": { + "hoek": { + "version": "6.1.2", + "resolved": "https://registry.npmjs.org/hoek/-/hoek-6.1.2.tgz", + "integrity": "sha512-6qhh/wahGYZHFSFw12tBbJw5fsAhhwrrG/y3Cs0YMTv2WzMnL0oLPnQJjv1QJvEfylRSOFuP+xCu+tdx0tD16Q==" + } } }, "js-levenshtein": { diff --git a/package.json b/package.json index e92c664..6b4e498 100644 --- a/package.json +++ b/package.json @@ -63,10 +63,10 @@ "dependencies": { "@travi/github-scaffolder": "3.0.3-alpha.3", "@travi/gitlab-scaffolder": "1.0.0", - "@travi/javascript-scaffolder": "4.5.0-alpha.2", + "@travi/javascript-scaffolder": "4.6.0-alpha.1", "@travi/netlify-scaffolder": "1.1.0", "@travi/node-app-engine-standard-scaffolder": "1.0.0-alpha.1", - "@travi/project-scaffolder": "5.2.3", + "@travi/project-scaffolder": "6.0.0-beta.1", "@travi/travis-scaffolder-javascript": "1.7.1" } } diff --git a/test/integration/features/step_definitions/common-steps.js b/test/integration/features/step_definitions/common-steps.js index 55fba32..ee223cf 100644 --- a/test/integration/features/step_definitions/common-steps.js +++ b/test/integration/features/step_definitions/common-steps.js @@ -31,6 +31,7 @@ Before(async () => { const octokitFiles = await readdir(resolve(...pathToNodeModules, 'octokit-pagination-methods/lib/')); stubbedFs({ [`${process.env.HOME}/.netrc`]: `machine github.com\n login ${githubToken}`, + [`${process.env.HOME}/.gitconfig`]: '[github]\n\tuser = travi', node_modules: { 'octokit-pagination-methods': { lib: (await Promise.all(loadOctokitFiles(octokitFiles))).reduce(buildOctokitFileMap(octokitFiles), {}) diff --git a/test/integration/features/step_definitions/vcs/github-api-steps.js b/test/integration/features/step_definitions/vcs/github-api-steps.js index 15cfb90..4ca8964 100644 --- a/test/integration/features/step_definitions/vcs/github-api-steps.js +++ b/test/integration/features/step_definitions/vcs/github-api-steps.js @@ -22,5 +22,8 @@ Given(/^the GitHub token is valid$/, async function () { githubScope .matchHeader('Authorization', `token ${githubToken}`) .post('/user/repos') - .reply(OK); + .reply(OK, { + ssl_url: any.url(), + https_url: any.url() + }); });