diff --git a/package-lock.json b/package-lock.json index 4f08a44..2c9e506 100644 --- a/package-lock.json +++ b/package-lock.json @@ -2650,9 +2650,9 @@ } }, "@octokit/rest": { - "version": "16.14.0", - "resolved": "https://registry.npmjs.org/@octokit/rest/-/rest-16.14.0.tgz", - "integrity": "sha512-PxKd+mAdgTTXQCgKm7HaEWX0+7Quf00cDsM0cFnW2o0y835TEuTAu3TMzmGsi+CqF8sAHeFKi+RJu6wkRr1uaA==", + "version": "16.15.0", + "resolved": "https://registry.npmjs.org/@octokit/rest/-/rest-16.15.0.tgz", + "integrity": "sha512-Un+e7rgh38RtPOTe453pT/KPM/p2KZICimBmuZCd2wEo8PacDa4h6RqTPZs+f2DPazTTqdM7QU4LKlUjgiBwWw==", "requires": { "@octokit/request": "2.3.0", "before-after-hook": "^1.2.0", @@ -2762,9 +2762,9 @@ } }, "@travi/github-scaffolder": { - "version": "3.0.3-alpha.3", - "resolved": "https://registry.npmjs.org/@travi/github-scaffolder/-/github-scaffolder-3.0.3-alpha.3.tgz", - "integrity": "sha512-HY1ETbEjeeud9rn66TeVKETHlcixM5r46NjWJJJ26UIM0qRP+oDrmlS/1x2+EWmyoOoiyUbzao0ZkIrXVj+ZCg==", + "version": "3.0.3-alpha.6", + "resolved": "https://registry.npmjs.org/@travi/github-scaffolder/-/github-scaffolder-3.0.3-alpha.6.tgz", + "integrity": "sha512-B469u1sjq4CV4vTGFQJLQt0dXwWbzmUlQ8ILBoz6v5CQJpeiQE57dxXNImBRu7/lSLX0C/VPykIvxNpG0BcyMA==", "requires": { "@octokit/rest": "^16.13.1", "chalk": "^2.4.1", @@ -3098,9 +3098,9 @@ } }, "@travi/project-scaffolder": { - "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==", + "version": "6.0.0-beta.2", + "resolved": "https://registry.npmjs.org/@travi/project-scaffolder/-/project-scaffolder-6.0.0-beta.2.tgz", + "integrity": "sha512-qWjCEE8/E6Th3VkE5vPeOeYysLWxVrHjIQjXsUoC4yaJSqD+WkBt7xiLk8cl1jeFjiPtFs8WRRw71yxRQCJu2A==", "requires": { "chalk": "^2.4.1", "hoek": "^6.0.0", @@ -6957,7 +6957,6 @@ "version": "0.1.4", "bundled": true, "dev": true, - "optional": true, "requires": { "kind-of": "^3.0.2", "longest": "^1.0.1", @@ -7279,8 +7278,7 @@ "is-buffer": { "version": "1.1.6", "bundled": true, - "dev": true, - "optional": true + "dev": true }, "is-builtin-module": { "version": "1.0.0", @@ -7364,7 +7362,6 @@ "version": "3.2.2", "bundled": true, "dev": true, - "optional": true, "requires": { "is-buffer": "^1.1.5" } @@ -7411,8 +7408,7 @@ "longest": { "version": "1.0.1", "bundled": true, - "dev": true, - "optional": true + "dev": true }, "lru-cache": { "version": "4.1.3", @@ -7678,8 +7674,7 @@ "repeat-string": { "version": "1.6.1", "bundled": true, - "dev": true, - "optional": true + "dev": true }, "require-directory": { "version": "2.1.1", diff --git a/package.json b/package.json index a2481a6..04dead3 100644 --- a/package.json +++ b/package.json @@ -61,12 +61,12 @@ "sinon": "^7.2.3" }, "dependencies": { - "@travi/github-scaffolder": "3.0.3-alpha.3", + "@travi/github-scaffolder": "3.0.3-alpha.6", "@travi/gitlab-scaffolder": "1.0.1", "@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": "6.0.0-beta.1", + "@travi/project-scaffolder": "6.0.0-beta.2", "@travi/travis-scaffolder-javascript": "1.7.1" } } diff --git a/test/integration/features/other.feature b/test/integration/features/other.feature index 3671a17..5f41327 100644 --- a/test/integration/features/other.feature +++ b/test/integration/features/other.feature @@ -6,3 +6,4 @@ Feature: Other Project Type And the project language should be Other When the project is scaffolded Then core ignores are defined + And the base git files should be present diff --git a/test/integration/features/step_definitions/vcs/git-steps.js b/test/integration/features/step_definitions/vcs/git-steps.js index 42da07b..9780f02 100644 --- a/test/integration/features/step_definitions/vcs/git-steps.js +++ b/test/integration/features/step_definitions/vcs/git-steps.js @@ -2,6 +2,7 @@ import {exists, readFile} from 'mz/fs'; import {Given, Then} from 'cucumber'; import bddStdIn from 'bdd-stdin'; import {assert} from 'chai'; +// import toml from '@iarna/toml'; Given(/^the project should be versioned in git$/, async function () { this.setAnswerFor('gitRepo', '\n'); @@ -37,6 +38,7 @@ Then(/^the base git files should be present$/, async function () { const gitAttributes = await readFile(`${process.cwd()}/.gitattributes`); assert.equal(gitAttributes, '* text=auto'); + // console.log(toml.parse(await readFile(`${process.cwd()}/.git/config`))) // assert.isTrue(gitDirectoryStats.isDirectory()); }); 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 4ca8964..d65836b 100644 --- a/test/integration/features/step_definitions/vcs/github-api-steps.js +++ b/test/integration/features/step_definitions/vcs/github-api-steps.js @@ -23,7 +23,7 @@ Given(/^the GitHub token is valid$/, async function () { .matchHeader('Authorization', `token ${githubToken}`) .post('/user/repos') .reply(OK, { - ssl_url: any.url(), - https_url: any.url() + // ssh_url: any.url(), + html_url: any.url() }); });