Skip to content
Permalink

Comparing changes

Choose two branches to see what’s changed or to start a new pull request. If you need to, you can also or learn more about diff comparisons.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also . Learn more about diff comparisons here.
base repository: alfateam/a
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: 13305fc233a97daf490a8872d48b0e1a7bc64d20
Choose a base ref
...
head repository: alfateam/a
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: b9a9461464c2883652112b2058f7e21fd042a3dc
Choose a head ref
  • 3 commits
  • 2 files changed
  • 3 contributors

Commits on Feb 24, 2018

  1. Typo in examples

    qm3ster authored Feb 24, 2018
    Copy the full SHA
    b019ec8 View commit details

Commits on Feb 28, 2018

  1. Merge pull request #4 from qm3ster/patch-1

    Typo in examples
    lroal authored Feb 28, 2018
    Copy the full SHA
    687503d View commit details
  2. version 2.1.2

    lroal committed Feb 28, 2018
    Copy the full SHA
    b9a9461 View commit details
Showing with 6 additions and 2 deletions.
  1. +4 −1 README.md
  2. +2 −1 package.json
5 changes: 4 additions & 1 deletion README.md
Original file line number Diff line number Diff line change
@@ -117,7 +117,7 @@ mock({a : 'x'}); //throws unexpected arguments
mock({a : 1}); //returns 'fake1'
mock({a : 2}); //returns 'fake2'
mock({a : 2, b : {c : 'foo', d : ['me', 'too']}}); //returns 'fake3'
mock(obj); //returns 'fake3'
mock(obj); //returns 'fake4'
mock({}); //throws unexpected arguments
```

@@ -614,6 +614,9 @@ when(c).then(it => {

Release Notes
---------------
__2.1.2__
- [typo in docs](https://github.com/alfateam/a/pull/4)

__2.1.0__
- short hand syntax for returning promises (sync)

3 changes: 2 additions & 1 deletion package.json
Original file line number Diff line number Diff line change
@@ -1,10 +1,11 @@
{
"name": "a",
"version": "2.1.1",
"version": "2.1.2",
"main": "index.js",
"title": "a",
"description": "Mocking framework and test framework in compact when-style. With recursive test runner",
"keywords": ["mock","mocking","partial mock","strict mock","tdd","bdd","test runner","stub","stubbing","mock require","verify","unit test"],
"license": "MIT",
"dependencies": {
"a_mock": "1.0.5",
"a_test": "1.0.9"