Merge branch 'release/1.1.3'

davesag · Nov 15, 2019 · e474742 · e474742
2 parents 22b2b67 + a7b80f4
commit e474742
Show file tree

Hide file tree

Showing 6 changed files with 1,315 additions and 1,806 deletions.
diff --git a/.circleci/config.yml b/.circleci/config.yml
@@ -10,7 +10,7 @@ jobs:
 
       - restore_cache:
           keys:
-          - v1-dependencies-{{ checksum "package.json" }}
+          - dependencies-{{ checksum "package.json" }}
 
       - run:
           name: Install global packages
@@ -25,7 +25,7 @@ jobs:
           command: npm install
 
       - save_cache:
-          key: v1-dependencies-{{ checksum "package.json" }}
+          key: dependencies-{{ checksum "package.json" }}
           paths:
             - node_modules
 
@@ -37,9 +37,10 @@ jobs:
           name: All Unit Tests with Code Coverage
           command: npm run test:unit:cov
 
-      - run:
-          name: Mutation Tests
-          command: npm run test:mutants
+      # Far too flakey to run on CI
+      # - run:
+      #     name: Mutation Tests
+      #     command: npm run test:mutants
 
       - run:
           name: Push any lockfile changes

diff --git a/.github/FUNDING.yml b/.github/FUNDING.yml
@@ -0,0 +1,3 @@
+# These are supported funding model platforms
+
+github: [davesag]
diff --git a/README.md b/README.md
@@ -2,16 +2,6 @@
 
 A collection of utilities to help with unit-testing [Sequelize](http://docs.sequelizejs.com) models and code that needs those models.
 
-[![Greenkeeper badge](https://badges.greenkeeper.io/davesag/sequelize-test-helpers.svg)](https://greenkeeper.io/)
-
-## Branches
-
-<!-- prettier-ignore -->
-| Branch | Status | Coverage |   |
-| ------ | ------ | -------- | - |
-| `develop` | [![CircleCI](https://circleci.com/gh/davesag/sequelize-test-helpers/tree/develop.svg?style=svg)](https://circleci.com/gh/davesag/sequelize-test-helpers/tree/develop) | [![codecov](https://codecov.io/gh/davesag/sequelize-test-helpers/branch/develop/graph/badge.svg)](https://codecov.io/gh/davesag/sequelize-test-helpers) | Work in progress |
-| `master` | [![CircleCI](https://circleci.com/gh/davesag/sequelize-test-helpers/tree/master.svg?style=svg)](https://circleci.com/gh/davesag/sequelize-test-helpers/tree/master) | [![codecov](https://codecov.io/gh/davesag/sequelize-test-helpers/branch/master/graph/badge.svg)](https://codecov.io/gh/davesag/sequelize-test-helpers) | Latest stable release |
-
 [![NPM](https://nodei.co/npm/sequelize-test-helpers.png)](https://nodei.co/npm/sequelize-test-helpers/)
 
 ## Related Projects
@@ -26,6 +16,7 @@ This library assumes:
 
 1. You are using [`chai`](http://www.chaijs.com) — Version 4 or better.
 2. You are using [`sinon`](http://sinonjs.org) — Version 5 or better.
+3. Using [`mocha`](https://mochajs.org) is also recommended, but as long as you are using `chai` and `sinon` this should work with any test runner.
 
 ### Installation
 
@@ -100,7 +91,7 @@ const model = (sequelize, DataTypes) => {
 module.exports = model
 ```
 
-You can use `sequelize-test-helpers` to unit-test this as follows:
+You can use `sequelize-test-helpers` to unit-test this with `mocha` as follows:
 
 #### `test/unit/models/User.spec.js`
 
@@ -328,6 +319,16 @@ By default `makeMockModels` and `listModels` will both look for your models in f
 
 ## Development
 
+[![Greenkeeper badge](https://badges.greenkeeper.io/davesag/sequelize-test-helpers.svg)](https://greenkeeper.io/)
+
+## Branches
+
+<!-- prettier-ignore -->
+| Branch | Status | Coverage |   |
+| ------ | ------ | -------- | - |
+| `develop` | [![CircleCI](https://circleci.com/gh/davesag/sequelize-test-helpers/tree/develop.svg?style=svg)](https://circleci.com/gh/davesag/sequelize-test-helpers/tree/develop) | [![codecov](https://codecov.io/gh/davesag/sequelize-test-helpers/branch/develop/graph/badge.svg)](https://codecov.io/gh/davesag/sequelize-test-helpers) | Work in progress |
+| `master` | [![CircleCI](https://circleci.com/gh/davesag/sequelize-test-helpers/tree/master.svg?style=svg)](https://circleci.com/gh/davesag/sequelize-test-helpers/tree/master) | [![codecov](https://codecov.io/gh/davesag/sequelize-test-helpers/branch/master/graph/badge.svg)](https://codecov.io/gh/davesag/sequelize-test-helpers) | Latest stable release |
+
 ### Prerequisites
 
 - [NodeJS](htps://nodejs.org), version 8.10.0 or better (I use [`nvm`](https://github.com/creationix/nvm) to manage Node versions — `brew install nvm`.)
Original file line number	Diff line number	Diff line change
		@@ -0,0 +1,3 @@
		# These are supported funding model platforms

		github: [davesag]