forked from sequelize/sequelize
-
Notifications
You must be signed in to change notification settings - Fork 0
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge pull request sequelize#1566 from sequelize/feature/logging
Refactored logging
- Loading branch information
Showing
10 changed files
with
111 additions
and
30 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,78 @@ | ||
| var chai = require('chai') | ||
| , sinonChai = require("sinon-chai") | ||
| , sinon = require('sinon') | ||
| , fs = require('fs') | ||
| , path = require('path') | ||
| , expect = chai.expect | ||
| , assert = chai.assert | ||
| , Support = require(__dirname + '/../support') | ||
|
|
||
| chai.use(sinonChai) | ||
| chai.config.includeStack = true | ||
|
|
||
| describe(Support.getTestDialectTeaser("Sequelize"), function () { | ||
| describe('log', function() { | ||
| beforeEach(function() { | ||
| this.spy = sinon.spy(console, 'log') | ||
| }) | ||
|
|
||
| afterEach(function() { | ||
| console.log.restore() | ||
| }) | ||
|
|
||
| describe("with disabled logging", function() { | ||
| beforeEach(function() { | ||
| this.sequelize = new Support.Sequelize('db', 'user', 'pw', { logging: false }) | ||
| }) | ||
|
|
||
| it("does not call the log method of the logger", function() { | ||
| this.sequelize.log() | ||
| expect(this.spy.calledOnce).to.be.false | ||
| }) | ||
| }) | ||
|
|
||
| describe('with default logging options', function() { | ||
| beforeEach(function() { | ||
| this.sequelize = new Support.Sequelize('db', 'user', 'pw') | ||
| }) | ||
|
|
||
| describe("called with no arguments", function() { | ||
| it('calls the log method', function() { | ||
| this.sequelize.log() | ||
| expect(this.spy.calledOnce).to.be.true | ||
| }) | ||
|
|
||
| it('logs an empty string as info event', function() { | ||
| this.sequelize.log() | ||
| expect(this.spy.calledOnce).to.be.true | ||
| }) | ||
| }) | ||
|
|
||
| describe("called with one argument", function() { | ||
| it('logs the passed string as info event', function() { | ||
| this.sequelize.log('my message') | ||
| expect(this.spy.withArgs('my message').calledOnce).to.be.true | ||
| }) | ||
| }) | ||
|
|
||
| describe("called with more than two arguments", function() { | ||
| it("passes the arguments to the logger", function() { | ||
| this.sequelize.log('error', 'my message', 1, { a: 1 }) | ||
| expect(this.spy.withArgs('error', 'my message', 1, { a: 1 }).calledOnce).to.be.true | ||
| }) | ||
| }) | ||
| }) | ||
|
|
||
| describe("with a custom function for logging", function() { | ||
| beforeEach(function() { | ||
| this.spy = sinon.spy() | ||
| this.sequelize = new Support.Sequelize('db', 'user', 'pw', { logging: this.spy }) | ||
| }) | ||
|
|
||
| it("calls the custom logger method", function() { | ||
| this.sequelize.log('om nom') | ||
| expect(this.spy.calledOnce).to.be.true | ||
| }) | ||
| }) | ||
| }) | ||
| }) |