Skip to content

Commit

Permalink
fix merge errors
Browse files Browse the repository at this point in the history
  • Loading branch information
AccaliaDeElementia committed Dec 20, 2016
1 parent 23af483 commit f484cfe
Showing 1 changed file with 7 additions and 7 deletions.
14 changes: 7 additions & 7 deletions test/debug_spec.js
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ if (typeof module !== 'undefined') {
var expect = chai.expect;

var debug = require('../src/index');
var = require('sinon');
var sinon = require('sinon');
var sinonChai = require("sinon-chai");
chai.use(sinonChai);
}
Expand Down Expand Up @@ -36,20 +36,20 @@ describe('debug', function () {
});
});

describe('custom functions', () => {
let log;
describe('custom functions', function () {
var log;

beforeEach(() => {
beforeEach(function () {
debug.enable('test');
log = debug('test');
});

context('with log function', () => {
it('uses it', () => {
context('with log function', function () {
it('uses it', function () {
log.log = sinon.spy();
log('using custom log function');

chai.assert.calledOnce(log.log);
expect(log.log).to.have.been.calledOnce;
});
});
});
Expand Down

0 comments on commit f484cfe

Please sign in to comment.