Skip to content
This repository has been archived by the owner on Feb 27, 2022. It is now read-only.

Commit

Permalink
Merge branch 'release/1.0.17'
Browse files Browse the repository at this point in the history
  • Loading branch information
thetutlage committed Oct 1, 2018
2 parents 1350106 + 1dda1f5 commit 4a461e2
Show file tree
Hide file tree
Showing 6 changed files with 28 additions and 30 deletions.
2 changes: 1 addition & 1 deletion .github/PULL_REQUEST_TEMPLATE.md
Expand Up @@ -18,7 +18,7 @@ _Put an `x` in the boxes that apply_

_Put an `x` in the boxes that apply. You can also fill these out after creating the PR. If you're unsure about any of them, don't hesitate to ask. We're here to help! This is simply a reminder of what we are going to look for before merging your code._

- [ ] I have read the [CONTRIBUTING](https://github.com/adonisjs/adonis-vow/CONTRIBUTING.md) doc
- [ ] I have read the [CONTRIBUTING](https://github.com/adonisjs/adonis-vow/blob/develop/CONTRIBUTING.md) doc
- [ ] Lint and unit tests pass locally with my changes
- [ ] I have added tests that prove my fix is effective or that my feature works.
- [ ] I have added necessary documentation (if appropriate)
Expand Down
11 changes: 11 additions & 0 deletions CHANGELOG.md
@@ -1,3 +1,14 @@
<a name="1.0.17"></a>
## [1.0.17](https://github.com/adonisjs/adonis-vow/compare/v1.0.16...v1.0.17) (2018-10-01)


### Features

* **assert:** assert cookie exists ([#28](https://github.com/adonisjs/adonis-vow/issues/28)) ([0d99590](https://github.com/adonisjs/adonis-vow/commit/0d99590))
* **runner:** allow customer reporters via runner.reporter ([1350106](https://github.com/adonisjs/adonis-vow/commit/1350106))



<a name="1.0.16"></a>
## [1.0.16](https://github.com/adonisjs/adonis-vow/compare/v1.0.15...v1.0.16) (2018-07-16)

Expand Down
2 changes: 1 addition & 1 deletion LICENSE.md
@@ -1,6 +1,6 @@
# The MIT License

Copyright 2018 thetutlage, contributors
Copyright 2018 Harminder Virk, contributors

Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the 'Software'), to deal in the Software without restriction, including without limitation the rights to use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the Software, and to permit persons to whom the Software is furnished to do so, subject to the following conditions:

Expand Down
2 changes: 1 addition & 1 deletion appveyor.yml
Expand Up @@ -9,7 +9,7 @@ install:
test_script:
- node --version
- npm --version
- 'npm run test:win'
- npm run test:win
build: 'off'
clone_depth: 1
matrix:
Expand Down
12 changes: 0 additions & 12 deletions japaFile.js
@@ -1,14 +1,2 @@
'use strict'

/*
* adonis-vow
*
* (c) Harminder Virk <virk@adonisjs.com>
*
* For the full copyright and license information, please view the LICENSE
* file that was distributed with this source code.
*/

const cli = require('japa/cli')

cli.run('test/*/*.spec.js')
29 changes: 14 additions & 15 deletions package.json
@@ -1,6 +1,6 @@
{
"name": "@adonisjs/vow",
"version": "1.0.16",
"version": "1.0.17",
"description": "Test runner for Adonis framework with batteries included 🔋",
"main": "index.js",
"scripts": {
Expand All @@ -22,32 +22,32 @@
"author": "virk",
"license": "MIT",
"devDependencies": {
"@adonisjs/ace": "^5.0.2",
"@adonisjs/ace": "^5.0.5",
"@adonisjs/fold": "^4.0.9",
"@adonisjs/mrm-preset": "^1.0.9",
"@adonisjs/sink": "^1.0.16",
"@adonisjs/mrm-preset": "^1.0.13",
"@adonisjs/sink": "^1.0.17",
"commitizen": "^2.10.1",
"coveralls": "^3.0.2",
"cz-conventional-changelog": "^2.1.0",
"fs-extra": "^6.0.1",
"fs-extra": "^7.0.0",
"japa-cli": "^1.0.1",
"mrm": "^1.2.1",
"nyc": "^12.0.2",
"nyc": "^13.0.1",
"pkg-ok": "^2.2.0",
"semver": "^5.5.0",
"standard": "^11.0.1",
"semver": "^5.5.1",
"standard": "^12.0.1",
"upath": "^1.1.0"
},
"dependencies": {
"chai-subset": "^1.6.0",
"debug": "^3.1.0",
"debug": "^4.0.1",
"globby": "^8.0.1",
"japa": "^1.0.6",
"lodash": "^4.17.10",
"japa": "1.0.6",
"lodash": "^4.17.11",
"macroable": "^1.0.0",
"node-cookie": "^2.1.0",
"node-cookie": "^2.1.1",
"p-series": "^1.1.0",
"superagent": "^3.8.3"
"superagent": "^4.0.0-beta.5"
},
"config": {
"commitizen": {
Expand All @@ -56,8 +56,7 @@
},
"nyc": {
"exclude": [
"test",
"japaFile.js"
"test"
]
},
"directories": {
Expand Down

0 comments on commit 4a461e2

Please sign in to comment.