@@ -1675,28 +1675,25 @@ describe('Test lib.js:', function() {
1675
1675
var stashLogLevel ;
1676
1676
var stashOnGraphLogLevel ;
1677
1677
1678
- function consoleFn ( name , hasApply , messages ) {
1678
+ function consoleFn ( name , messages ) {
1679
1679
var out = function ( ) {
1680
- if ( hasApply ) expect ( this ) . toBe ( window . console ) ;
1681
1680
var args = [ ] ;
1682
1681
for ( var i = 0 ; i < arguments . length ; i ++ ) args . push ( arguments [ i ] ) ;
1683
1682
messages . push ( [ name , args ] ) ;
1684
1683
} ;
1685
1684
1686
- if ( ! hasApply ) out . apply = undefined ;
1687
-
1688
1685
return out ;
1689
1686
}
1690
1687
1691
- function mockConsole ( hasApply , hasTrace , hasError ) {
1688
+ function mockConsole ( ) {
1692
1689
var out = {
1693
1690
MESSAGES : [ ]
1694
1691
} ;
1695
- out . log = consoleFn ( 'log' , hasApply , out . MESSAGES ) ;
1692
+ out . log = consoleFn ( 'log' , out . MESSAGES ) ;
1696
1693
1697
- if ( hasError ) out . error = consoleFn ( 'error' , hasApply , out . MESSAGES ) ;
1694
+ out . error = consoleFn ( 'error' , out . MESSAGES ) ;
1698
1695
1699
- if ( hasTrace ) out . trace = consoleFn ( 'trace' , hasApply , out . MESSAGES ) ;
1696
+ out . trace = consoleFn ( 'trace' , out . MESSAGES ) ;
1700
1697
1701
1698
return out ;
1702
1699
}
@@ -1713,8 +1710,8 @@ describe('Test lib.js:', function() {
1713
1710
config . notifyOnLogging = stashOnGraphLogLevel ;
1714
1711
} ) ;
1715
1712
1716
- it ( 'emits one console message if apply is available ' , function ( ) {
1717
- var c = window . console = mockConsole ( true , true , true ) ;
1713
+ it ( 'emits one console message' , function ( ) {
1714
+ var c = window . console = mockConsole ( ) ;
1718
1715
config . logging = 2 ;
1719
1716
1720
1717
Lib . log ( 'tick' , 'tock' , 'tick' , 'tock' , 1 ) ;
@@ -1728,50 +1725,8 @@ describe('Test lib.js:', function() {
1728
1725
] ) ;
1729
1726
} ) ;
1730
1727
1731
- it ( 'falls back on console.log if no trace' , function ( ) {
1732
- var c = window . console = mockConsole ( true , false , true ) ;
1733
- config . logging = 2 ;
1734
-
1735
- Lib . log ( 'Hi' ) ;
1736
- Lib . warn ( 42 ) ;
1737
-
1738
- expect ( c . MESSAGES ) . toEqual ( [
1739
- [ 'log' , [ 'LOG:' , 'Hi' ] ] ,
1740
- [ 'log' , [ 'WARN:' , 42 ] ]
1741
- ] ) ;
1742
- } ) ;
1743
-
1744
- it ( 'falls back on separate calls if no apply' , function ( ) {
1745
- var c = window . console = mockConsole ( false , false , true ) ;
1746
- config . logging = 2 ;
1747
-
1748
- Lib . log ( 'tick' , 'tock' , 'tick' , 'tock' , 1 ) ;
1749
- Lib . warn ( 'I\'m' , 'a' , 'little' , 'cuckoo' , 'clock' , [ 1 , 2 ] ) ;
1750
- Lib . error ( 'cuckoo!' , 'cuckoo!!!' , { a : 1 , b : 2 } ) ;
1751
-
1752
- expect ( c . MESSAGES ) . toEqual ( [
1753
- [ 'log' , [ 'LOG:' ] ] ,
1754
- [ 'log' , [ 'tick' ] ] ,
1755
- [ 'log' , [ 'tock' ] ] ,
1756
- [ 'log' , [ 'tick' ] ] ,
1757
- [ 'log' , [ 'tock' ] ] ,
1758
- [ 'log' , [ 1 ] ] ,
1759
- [ 'log' , [ 'WARN:' ] ] ,
1760
- [ 'log' , [ 'I\'m' ] ] ,
1761
- [ 'log' , [ 'a' ] ] ,
1762
- [ 'log' , [ 'little' ] ] ,
1763
- [ 'log' , [ 'cuckoo' ] ] ,
1764
- [ 'log' , [ 'clock' ] ] ,
1765
- [ 'log' , [ [ 1 , 2 ] ] ] ,
1766
- [ 'error' , [ 'ERROR:' ] ] ,
1767
- [ 'error' , [ 'cuckoo!' ] ] ,
1768
- [ 'error' , [ 'cuckoo!!!' ] ] ,
1769
- [ 'error' , [ { a : 1 , b : 2 } ] ]
1770
- ] ) ;
1771
- } ) ;
1772
-
1773
1728
it ( 'omits .log at log level 1' , function ( ) {
1774
- var c = window . console = mockConsole ( true , true , true ) ;
1729
+ var c = window . console = mockConsole ( ) ;
1775
1730
config . logging = 1 ;
1776
1731
1777
1732
Lib . log ( 1 ) ;
@@ -1785,7 +1740,7 @@ describe('Test lib.js:', function() {
1785
1740
} ) ;
1786
1741
1787
1742
it ( 'logs nothing at log level 0' , function ( ) {
1788
- var c = window . console = mockConsole ( true , true , true ) ;
1743
+ var c = window . console = mockConsole ( ) ;
1789
1744
config . logging = 0 ;
1790
1745
1791
1746
Lib . log ( 1 ) ;
@@ -1795,22 +1750,6 @@ describe('Test lib.js:', function() {
1795
1750
expect ( c . MESSAGES ) . toEqual ( [ ] ) ;
1796
1751
} ) ;
1797
1752
1798
- it ( 'falls back on simple log if there is no console.error' , function ( ) {
1799
- // TODO
1800
-
1801
- var c = window . console = mockConsole ( true , true , false ) ;
1802
- config . logging = 2 ;
1803
-
1804
- Lib . error ( 'who are you' , 'who who... are you' , { a : 1 , b : 2 } ) ;
1805
-
1806
- expect ( c . MESSAGES ) . toEqual ( [
1807
- [ 'log' , [ 'ERROR:' ] ] ,
1808
- [ 'log' , [ 'who are you' ] ] ,
1809
- [ 'log' , [ 'who who... are you' ] ] ,
1810
- [ 'log' , [ { a : 1 , b : 2 } ] ]
1811
- ] ) ;
1812
- } ) ;
1813
-
1814
1753
describe ( 'should log message in notifier div in accordance notifyOnLogging config option' , function ( ) {
1815
1754
var query = '.notifier-note' ;
1816
1755
0 commit comments