Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Update dependency chai to v4 #61

Closed
wants to merge 6 commits into from
Closed

Update dependency chai to v4 #61

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
2bb3888
Update dependency chai to v4
renovate-bot Apr 22, 2018
7390830
Merge branch 'master' into renovate/chai-4.x
dotansimha Apr 22, 2018
0f53ac5
Merge branch 'master' into renovate/chai-4.x
dotansimha Apr 23, 2018
fbd7f11
update chai usage
dotansimha Apr 23, 2018
a5bee0d
Merge branch 'master' into renovate/chai-4.x
dotansimha Apr 23, 2018
7303b50
update lock file
dotansimha Apr 23, 2018
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@
},
"devDependencies": {
"babel-register": "6.26.0",
"chai": "3.5.0",
"chai": "4.1.2",
"chai-match": "1.1.1",
"escape-string-regexp": "1.0.5",
"eslint": "3.19.0",
Expand Down
14 changes: 7 additions & 7 deletions tests/release-test.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -223,18 +223,18 @@ describe('Release', function () {
const travisPath = Paths.travis;
const renovatePath = Paths.renovate;

expect(this.exists(travisPath)).to.be.truthy;
expect(this.exists(renovatePath)).to.be.truthy;
expect(this.exists(travisPath)).to.be.true;
expect(this.exists(renovatePath)).to.be.true;

this.git(['checkout', 'master@1.0.0']);

expect(this.exists(travisPath)).to.be.falsy;
expect(this.exists(renovatePath)).to.be.falsy;
expect(this.exists(travisPath)).to.be.false;
expect(this.exists(renovatePath)).to.be.false;

this.git(['checkout', 'master-history']);

expect(this.exists(travisPath)).to.be.falsy;
expect(this.exists(renovatePath)).to.be.falsy;
expect(this.exists(travisPath)).to.be.false;
expect(this.exists(renovatePath)).to.be.false;
});

it('should re-render all manuals using an updated release tag', function () {
Expand Down Expand Up @@ -383,4 +383,4 @@ describe('Release', function () {
expect(releaseDiff).to.be.a.file('release-update.diff');
});
});
});
});
34 changes: 17 additions & 17 deletions tests/step-test.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -60,7 +60,7 @@ describe('Step', function () {
expect(message).to.equal('Step 1.1: target');

const fileExists = this.exists(`${this.testDir}/.tortilla/manuals/templates/step1.tmpl`);
expect(fileExists).to.be.falsy;
expect(fileExists).to.be.false;
});

it('should delete branch referencing super step', function () {
Expand All @@ -80,7 +80,7 @@ describe('Step', function () {
branchExists = false;
}

expect(branchExists).to.be.falsy;
expect(branchExists).to.be.false;
});
});

Expand Down Expand Up @@ -109,7 +109,7 @@ describe('Step', function () {
expect(message).to.equal('Step 1: target');

const fileExists = this.exists(`${this.testDir}/.tortilla/manuals/templates/step1.tmpl`);
expect(fileExists).to.be.truthy;
expect(fileExists).to.be.true;
});

it('should create a new branch referencing the tagged step', function () {
Expand Down Expand Up @@ -203,7 +203,7 @@ describe('Step', function () {
this.tortilla(['step', 'edit', '1.1']);

const isRebasing = Git.rebasing();
expect(isRebasing).to.be.truthy;
expect(isRebasing).to.be.true;

const message = Step.recentCommit('%s');
expect(message).to.equal('Step 1.1: target');
Expand All @@ -222,7 +222,7 @@ describe('Step', function () {
this.tortilla(['step', 'edit', '1.1']);

const isRebasing = Git.rebasing();
expect(isRebasing).to.be.truthy;
expect(isRebasing).to.be.true;

const message = Step.recentCommit('%s');
expect(message).to.equal('Step 1.1: target');
Expand All @@ -233,7 +233,7 @@ describe('Step', function () {
this.tortilla(['step', 'edit', '--root']);

const isRebasing = Git.rebasing();
expect(isRebasing).to.be.truthy;
expect(isRebasing).to.be.true;

const commitHash = Git.recentCommit(['--format=%H']);
const rootHash = Git.rootHash();
Expand Down Expand Up @@ -334,10 +334,10 @@ describe('Step', function () {
expect(newMessage).to.equal('Step 1: new');

const oldFileExists = this.exists(`${this.testDir}/.tortilla/manuals/templates/step1.tmpl`);
expect(oldFileExists).to.be.truthy;
expect(oldFileExists).to.be.true;

const newFileExists = this.exists(`${this.testDir}/.tortilla/manuals/templates/step2.tmpl`);
expect(newFileExists).to.be.truthy;
expect(newFileExists).to.be.true;
});

it('should resolve removal conflicts when tagging a step', function () {
Expand All @@ -352,7 +352,7 @@ describe('Step', function () {
expect(oldMessage).to.equal('Step 1: old');

const oldFileExists = this.exists(`${this.testDir}/.tortilla/manuals/templates/step1.tmpl`);
expect(oldFileExists).to.be.truthy;
expect(oldFileExists).to.be.true;
});

it('should edit the last step by default if no step specified', function () {
Expand All @@ -361,7 +361,7 @@ describe('Step', function () {
this.tortilla(['step', 'edit']);

const isRebasing = Git.rebasing();
expect(isRebasing).to.be.truthy;
expect(isRebasing).to.be.true;

const message = Step.recentCommit('%s');
expect(message).to.equal('Step 1.2: target');
Expand All @@ -379,15 +379,15 @@ describe('Step', function () {
let isRebasing, message;

isRebasing = Git.rebasing();
expect(isRebasing).to.be.truthy;
expect(isRebasing).to.be.true;

message = Step.recentCommit('%s');
expect(message).to.equal('Step 1.2: target');

Git(['rebase', '--continue']);

isRebasing = Git.rebasing();
expect(isRebasing).to.be.truthy;
expect(isRebasing).to.be.true;

message = Step.recentCommit('%s');
expect(message).to.equal('Step 1.4: target');
Expand All @@ -405,15 +405,15 @@ describe('Step', function () {
let isRebasing, message;

isRebasing = Git.rebasing();
expect(isRebasing).to.be.truthy;
expect(isRebasing).to.be.true;

message = Step.recentCommit('%s');
expect(message).to.equal('Step 1.2: target');

Git(['rebase', '--continue']);

isRebasing = Git.rebasing();
expect(isRebasing).to.be.truthy;
expect(isRebasing).to.be.true;

message = Step.recentCommit('%s');
expect(message).to.equal('Step 1.4: target');
Expand All @@ -432,7 +432,7 @@ describe('Step', function () {
let isRebasing, message;

isRebasing = Git.rebasing();
expect(isRebasing).to.be.truthy;
expect(isRebasing).to.be.true;

const commitHash = Git.recentCommit(['--format=%H']);
const rootHash = Git.rootHash();
Expand All @@ -441,7 +441,7 @@ describe('Step', function () {
Git(['rebase', '--continue']);

isRebasing = Git.rebasing();
expect(isRebasing).to.be.truthy;
expect(isRebasing).to.be.true;

message = Step.recentCommit('%s');
expect(message).to.equal('Step 1.1: target');
Expand Down Expand Up @@ -804,4 +804,4 @@ describe('Step', function () {
expect(stepCommitMessage).to.equal('Step 2.2: target commit');
});
});
});
});
10 changes: 5 additions & 5 deletions tests/submodule-test.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,7 @@ describe('Submodule', function () {
]);

const isRebasing = Git.rebasing();
expect(isRebasing).to.be.falsy;
expect(isRebasing).to.be.false;

this.tortilla(['step', 'edit', '--root']);

Expand Down Expand Up @@ -67,7 +67,7 @@ describe('Submodule', function () {
]);

const isRebasing = Git.rebasing();
expect(isRebasing).to.be.truthy;
expect(isRebasing).to.be.true;

const stagedFiles = Git.stagedFiles();

Expand Down Expand Up @@ -111,7 +111,7 @@ describe('Submodule', function () {
this.tortilla(['submodule', 'remove', Path.basename(this.fooModuleDir)]);

const isRebasing = Git.rebasing();
expect(isRebasing).to.be.truthy;
expect(isRebasing).to.be.true;

const stagedFiles = Git.stagedFiles();

Expand Down Expand Up @@ -146,7 +146,7 @@ describe('Submodule', function () {

this.tortilla(['submodule', 'update', Path.basename(this.fooModuleDir)]);

expect(this.exists(`${fooPath}/hello_world`)).to.be.truthy;
expect(this.exists(`${fooPath}/hello_world`)).to.be.true;
});
});

Expand Down Expand Up @@ -181,7 +181,7 @@ describe('Submodule', function () {

this.tortilla(['submodule', 'reset', Path.basename(this.fooModuleDir)]);

expect(this.exists(`${fooPath}/hello_world`)).to.be.falsy;
expect(this.exists(`${fooPath}/hello_world`)).to.be.false;
expect(this.exists(`${fooPath}/hello_planet`)).to.be.true;
});
});
Expand Down
47 changes: 31 additions & 16 deletions yarn.lock
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -293,13 +293,16 @@ chai-match@1.1.1:
version "1.1.1"
resolved "https://registry.yarnpkg.com/chai-match/-/chai-match-1.1.1.tgz#39fb0a2e6b7c8f6386dcfead48d148a915fa6c46"

chai@3.5.0:
version "3.5.0"
resolved "https://registry.yarnpkg.com/chai/-/chai-3.5.0.tgz#4d02637b067fe958bdbfdd3a40ec56fef7373247"
chai@4.1.2:
version "4.1.2"
resolved "https://registry.yarnpkg.com/chai/-/chai-4.1.2.tgz#0f64584ba642f0f2ace2806279f4f06ca23ad73c"
dependencies:
assertion-error "^1.0.1"
deep-eql "^0.1.3"
type-detect "^1.0.0"
check-error "^1.0.1"
deep-eql "^3.0.0"
get-func-name "^2.0.0"
pathval "^1.0.0"
type-detect "^4.0.0"

chalk@^1.0.0, chalk@^1.1.0, chalk@^1.1.1, chalk@^1.1.3:
version "1.1.3"
Expand All @@ -311,6 +314,10 @@ chalk@^1.0.0, chalk@^1.1.0, chalk@^1.1.1, chalk@^1.1.3:
strip-ansi "^3.0.0"
supports-color "^2.0.0"

check-error@^1.0.1:
version "1.0.2"
resolved "https://registry.yarnpkg.com/check-error/-/check-error-1.0.2.tgz#574d312edd88bb5dd8912e9286dd6c0aed4aac82"

circular-json@^0.3.1:
version "0.3.1"
resolved "https://registry.yarnpkg.com/circular-json/-/circular-json-0.3.1.tgz#be8b36aefccde8b3ca7aa2d6afc07a37242c0d2d"
Expand Down Expand Up @@ -341,6 +348,10 @@ code-point-at@^1.0.0:
version "1.1.0"
resolved "https://registry.yarnpkg.com/code-point-at/-/code-point-at-1.1.0.tgz#0d070b4d043a5bea33a2f1a40e2edb3d9a4ccf77"

commander@2.11.0:
version "2.11.0"
resolved "https://registry.yarnpkg.com/commander/-/commander-2.11.0.tgz#157152fd1e7a6c8d98a5b715cf376df928004563"

commander@2.15.1:
version "2.15.1"
resolved "https://registry.yarnpkg.com/commander/-/commander-2.15.1.tgz#df46e867d0fc2aec66a34662b406a9ccafff5b0f"
Expand Down Expand Up @@ -405,11 +416,11 @@ decamelize@^1.0.0:
version "1.2.0"
resolved "https://registry.yarnpkg.com/decamelize/-/decamelize-1.2.0.tgz#f6534d15148269b20352e7bee26f501f9a191290"

deep-eql@^0.1.3:
version "0.1.3"
resolved "https://registry.yarnpkg.com/deep-eql/-/deep-eql-0.1.3.tgz#ef558acab8de25206cd713906d74e56930eb69f2"
deep-eql@^3.0.0:
version "3.0.1"
resolved "https://registry.yarnpkg.com/deep-eql/-/deep-eql-3.0.1.tgz#dfc9404400ad1c8fe023e7da1df1c147c4b444df"
dependencies:
type-detect "0.1.1"
type-detect "^4.0.0"

deep-is@~0.1.3:
version "0.1.3"
Expand Down Expand Up @@ -714,6 +725,10 @@ generate-object-property@^1.1.0:
dependencies:
is-property "^1.0.0"

get-func-name@^2.0.0:
version "2.0.0"
resolved "https://registry.yarnpkg.com/get-func-name/-/get-func-name-2.0.0.tgz#ead774abee72e20409433a066366023dd6887a41"

glob@7.1.2, glob@^7.0.0, glob@^7.0.3, glob@^7.0.5:
version "7.1.2"
resolved "https://registry.yarnpkg.com/glob/-/glob-7.1.2.tgz#c19c9df9a028702d678612384a6552404c636d15"
Expand Down Expand Up @@ -1166,6 +1181,10 @@ path-type@^2.0.0:
dependencies:
pify "^2.0.0"

pathval@^1.0.0:
version "1.1.0"
resolved "https://registry.yarnpkg.com/pathval/-/pathval-1.1.0.tgz#b942e6d4bde653005ef6b71361def8727d0645e0"

pify@^2.0.0:
version "2.3.0"
resolved "https://registry.yarnpkg.com/pify/-/pify-2.3.0.tgz#ed141a6ac043a849ea588498e7dca8b15330e90c"
Expand Down Expand Up @@ -1475,13 +1494,9 @@ type-check@~0.3.2:
dependencies:
prelude-ls "~1.1.2"

type-detect@0.1.1:
version "0.1.1"
resolved "https://registry.yarnpkg.com/type-detect/-/type-detect-0.1.1.tgz#0ba5ec2a885640e470ea4e8505971900dac58822"

type-detect@^1.0.0:
version "1.0.0"
resolved "https://registry.yarnpkg.com/type-detect/-/type-detect-1.0.0.tgz#762217cc06db258ec48908a1298e8b95121e8ea2"
type-detect@^4.0.0:
version "4.0.8"
resolved "https://registry.yarnpkg.com/type-detect/-/type-detect-4.0.8.tgz#7646fb5f18871cfbb7749e69bd39a6388eb7450c"

typedarray@^0.0.6:
version "0.0.6"
Expand Down