Skip to content

Commit

Permalink
Merge remote-tracking branch 'upstream/master' into fix/cannot-read-p…
Browse files Browse the repository at this point in the history
…roperty-currentretry

* upstream/master:
  helpful error when necessary suite callback omitted; closes mochajs#1744
  Fix an issue and add relevant tests when describe and xdescribe fail when not supplied with a callback (issue mochajs#1744).
  rename more fixtures; closes mochajs#2383
  Report non-match to STDERR and exit if no files are matched (mochajs#2450)
  Exit process with correct error codes (mochajs#2445)
  fix test files not using .spec suffix fix test fixtures not using .fixture suffix
  always halt execution when async skip() called; closes mochajs#2465 (mochajs#2479)
  avoid test flake in "delay" test; closes mochajs#2469 (mochajs#2470)
  revert accidental change to bin paths
  disregard function names when testing under Node.js 6.5.0; closes mochajs#2467 (mochajs#2477)
  lints more files; add more files to lint check; closes mochajs#2457
  adds *.orig to .gitignore
  Exclude the --inspect flag
  fix check-leaks to catch a leak whose name begins with 'd'
  • Loading branch information
Dmitry Sorin committed Sep 19, 2016
2 parents d5fe815 + 3a2dae8 commit 880bdd9
Show file tree
Hide file tree
Showing 140 changed files with 654 additions and 437 deletions.
2 changes: 2 additions & 0 deletions .eslintignore
@@ -1 +1,3 @@
lib/to-iso-string/
test/**/*
!test/runner.js
2 changes: 2 additions & 0 deletions .gitignore
Expand Up @@ -13,3 +13,5 @@ lib/browser/diff.js
npm-debug.log*
.envrc
.karma/
*.orig

30 changes: 15 additions & 15 deletions Makefile
Expand Up @@ -25,7 +25,7 @@ clean:

lint:
@printf "==> [Test :: Lint]\n"
$(ESLINT) "lib/**/*.js"
$(ESLINT) browser-entry.js index.js karma.conf.js bin/mocha bin/_mocha "lib/**/*.js" "scripts/**/*.js" test

test-node: test-bdd test-tdd test-qunit test-exports test-unit test-integration test-jsapi test-compilers test-glob test-requires test-reporters test-only test-global-only

Expand Down Expand Up @@ -81,31 +81,31 @@ test-requires:
--require test/acceptance/require/b.coffee \
--require test/acceptance/require/c.js \
--require test/acceptance/require/d.coffee \
test/acceptance/require/require.js
test/acceptance/require/require.spec.js

test-bdd:
@printf "==> [Test :: BDD]\n"
$(MOCHA) --reporter $(REPORTER) \
--ui bdd \
test/acceptance/interfaces/bdd
test/acceptance/interfaces/bdd.spec

test-tdd:
@printf "==> [Test :: TDD]\n"
$(MOCHA) --reporter $(REPORTER) \
--ui tdd \
test/acceptance/interfaces/tdd
test/acceptance/interfaces/tdd.spec

test-qunit:
@printf "==> [Test :: QUnit]\n"
$(MOCHA) --reporter $(REPORTER) \
--ui qunit \
test/acceptance/interfaces/qunit
test/acceptance/interfaces/qunit.spec

test-exports:
@printf "==> [Test :: Exports]\n"
$(MOCHA) --reporter $(REPORTER) \
--ui exports \
test/acceptance/interfaces/exports
test/acceptance/interfaces/exports.spec

test-glob:
@printf "==> [Test :: Glob]\n"
Expand All @@ -120,29 +120,29 @@ test-only:
@printf "==> [Test :: Only]\n"
$(MOCHA) --reporter $(REPORTER) \
--ui tdd \
test/acceptance/misc/only/tdd
test/acceptance/misc/only/tdd.spec

$(MOCHA) --reporter $(REPORTER) \
--ui bdd \
test/acceptance/misc/only/bdd
test/acceptance/misc/only/bdd.spec

$(MOCHA) --reporter $(REPORTER) \
--ui qunit \
test/acceptance/misc/only/bdd-require
test/acceptance/misc/only/bdd-require.spec

test-global-only:
@printf "==> [Test :: Global Only]\n"
$(MOCHA) --reporter $(REPORTER) \
--ui tdd \
test/acceptance/misc/only/global/tdd
test/acceptance/misc/only/global/tdd.spec

$(MOCHA) --reporter $(REPORTER) \
--ui bdd \
test/acceptance/misc/only/global/bdd
test/acceptance/misc/only/global/bdd.spec

$(MOCHA) --reporter $(REPORTER) \
--ui qunit \
test/acceptance/misc/only/global/qunit
test/acceptance/misc/only/global/qunit.spec

test-mocha:
@printf "==> [Test :: Mocha]\n"
Expand All @@ -152,19 +152,19 @@ test-mocha:
non-tty:
@printf "==> [Test :: Non-TTY]\n"
$(MOCHA) --reporter dot \
test/acceptance/interfaces/bdd 2>&1 > /tmp/dot.out
test/acceptance/interfaces/bdd.spec 2>&1 > /tmp/dot.out

@echo dot:
@cat /tmp/dot.out

$(MOCHA) --reporter list \
test/acceptance/interfaces/bdd 2>&1 > /tmp/list.out
test/acceptance/interfaces/bdd.spec 2>&1 > /tmp/list.out

@echo list:
@cat /tmp/list.out

$(MOCHA) --reporter spec \
test/acceptance/interfaces/bdd 2>&1 > /tmp/spec.out
test/acceptance/interfaces/bdd.spec 2>&1 > /tmp/spec.out

@echo spec:
@cat /tmp/spec.out
Expand Down

0 comments on commit 880bdd9

Please sign in to comment.