@@ -6,15 +6,13 @@ var util = require('util');
66var expect = require ( 'expect' ) ;
77var miss = require ( 'mississippi' ) ;
88var cloneable = require ( 'cloneable-readable' ) ;
9- var saferBuffer = require ( 'safer-buffer' ) ;
109
1110var File = require ( '../' ) ;
1211
1312var pipe = miss . pipe ;
1413var from = miss . from ;
1514var concat = miss . concat ;
1615var isCloneable = cloneable . isCloneable ;
17- var Buffer = saferBuffer . Buffer ;
1816
1917var isWin = ( process . platform === 'win32' ) ;
2018
@@ -98,7 +96,7 @@ describe('File', function() {
9896
9997 it ( 'defaults path to null' , function ( done ) {
10098 var file = new File ( ) ;
101- expect ( file . path ) . toNotExist ( ) ;
99+ expect ( file . path ) . toBeFalsy ( ) ;
102100 expect ( file . path ) . toEqual ( null ) ;
103101 done ( ) ;
104102 } ) ;
@@ -111,14 +109,14 @@ describe('File', function() {
111109
112110 it ( 'defaults stat to null' , function ( done ) {
113111 var file = new File ( ) ;
114- expect ( file . stat ) . toNotExist ( ) ;
112+ expect ( file . stat ) . toBeFalsy ( ) ;
115113 expect ( file . stat ) . toEqual ( null ) ;
116114 done ( ) ;
117115 } ) ;
118116
119117 it ( 'defaults contents to null' , function ( done ) {
120118 var file = new File ( ) ;
121- expect ( file . contents ) . toNotExist ( ) ;
119+ expect ( file . contents ) . toBeFalsy ( ) ;
122120 expect ( file . contents ) . toEqual ( null ) ;
123121 done ( ) ;
124122 } ) ;
@@ -435,11 +433,11 @@ describe('File', function() {
435433 var file = new File ( options ) ;
436434 var file2 = file . clone ( ) ;
437435
438- expect ( file2 ) . toNotBe ( file ) ;
436+ expect ( file2 ) . not . toBe ( file ) ;
439437 expect ( file2 . cwd ) . toEqual ( file . cwd ) ;
440438 expect ( file2 . base ) . toEqual ( file . base ) ;
441439 expect ( file2 . path ) . toEqual ( file . path ) ;
442- expect ( file2 . contents ) . toNotBe ( file . contents ) ;
440+ expect ( file2 . contents ) . not . toBe ( file . contents ) ;
443441 expect ( file2 . contents . toString ( 'utf8' ) ) . toEqual ( file . contents . toString ( 'utf8' ) ) ;
444442 done ( ) ;
445443 } ) ;
@@ -457,10 +455,10 @@ describe('File', function() {
457455 expect ( copy1 . contents ) . toBe ( file . contents ) ;
458456
459457 var copy2 = file . clone ( ) ;
460- expect ( copy2 . contents ) . toNotBe ( file . contents ) ;
458+ expect ( copy2 . contents ) . not . toBe ( file . contents ) ;
461459
462460 var copy3 = file . clone ( { contents : 'invalid' } ) ;
463- expect ( copy3 . contents ) . toNotBe ( file . contents ) ;
461+ expect ( copy3 . contents ) . not . toBe ( file . contents ) ;
464462 done ( ) ;
465463 } ) ;
466464
@@ -474,11 +472,11 @@ describe('File', function() {
474472 var file = new File ( options ) ;
475473 var file2 = file . clone ( ) ;
476474
477- expect ( file2 ) . toNotBe ( file ) ;
475+ expect ( file2 ) . not . toBe ( file ) ;
478476 expect ( file2 . cwd ) . toEqual ( file . cwd ) ;
479477 expect ( file2 . base ) . toEqual ( file . base ) ;
480478 expect ( file2 . path ) . toEqual ( file . path ) ;
481- expect ( file2 . contents ) . toNotBe ( file . contents ) ;
479+ expect ( file2 . contents ) . not . toBe ( file . contents ) ;
482480
483481 var ends = 2 ;
484482 var data = null ;
@@ -491,7 +489,7 @@ describe('File', function() {
491489 }
492490
493491 if ( -- ends === 0 ) {
494- expect ( data ) . toNotBe ( data2 ) ;
492+ expect ( data ) . not . toBe ( data2 ) ;
495493 expect ( data . toString ( 'utf8' ) ) . toEqual ( data2 . toString ( 'utf8' ) ) ;
496494 done ( ) ;
497495 }
@@ -596,7 +594,7 @@ describe('File', function() {
596594 var file = new File ( options ) ;
597595 var file2 = file . clone ( ) ;
598596
599- expect ( file2 ) . toNotBe ( file ) ;
597+ expect ( file2 ) . not . toBe ( file ) ;
600598 expect ( file2 . symlink ) . toEqual ( file . symlink ) ;
601599 done ( ) ;
602600 } ) ;
@@ -611,11 +609,11 @@ describe('File', function() {
611609 var file = new File ( options ) ;
612610 var file2 = file . clone ( ) ;
613611
614- expect ( file2 ) . toNotBe ( file ) ;
612+ expect ( file2 ) . not . toBe ( file ) ;
615613 expect ( file2 . cwd ) . toEqual ( file . cwd ) ;
616614 expect ( file2 . base ) . toEqual ( file . base ) ;
617615 expect ( file2 . path ) . toEqual ( file . path ) ;
618- expect ( file2 . contents ) . toNotExist ( ) ;
616+ expect ( file2 . contents ) . toBeFalsy ( ) ;
619617 done ( ) ;
620618 } ) ;
621619
@@ -633,8 +631,8 @@ describe('File', function() {
633631
634632 expect ( copy . stat . isFile ( ) ) . toEqual ( true ) ;
635633 expect ( copy . stat . isDirectory ( ) ) . toEqual ( false ) ;
636- expect ( file . stat ) . toBeAn ( fs . Stats ) ;
637- expect ( copy . stat ) . toBeAn ( fs . Stats ) ;
634+ expect ( file . stat ) . toBeInstanceOf ( fs . Stats ) ;
635+ expect ( copy . stat ) . toBeInstanceOf ( fs . Stats ) ;
638636 done ( ) ;
639637 } ) ;
640638
@@ -651,7 +649,7 @@ describe('File', function() {
651649
652650 expect ( copy . history [ 0 ] ) . toEqual ( options . path ) ;
653651 copy . path = 'lol' ;
654- expect ( file . path ) . toNotEqual ( copy . path ) ;
652+ expect ( file . path ) . not . toEqual ( copy . path ) ;
655653 done ( ) ;
656654 } ) ;
657655
@@ -667,12 +665,12 @@ describe('File', function() {
667665 var file = new File ( options ) ;
668666 var file2 = file . clone ( ) ;
669667
670- expect ( file2 ) . toNotBe ( file ) ;
668+ expect ( file2 ) . not . toBe ( file ) ;
671669 expect ( file2 . cwd ) . toEqual ( file . cwd ) ;
672670 expect ( file2 . base ) . toEqual ( file . base ) ;
673671 expect ( file2 . path ) . toEqual ( file . path ) ;
674- expect ( file2 . custom ) . toNotBe ( file . custom ) ;
675- expect ( file2 . custom . meta ) . toNotBe ( file . custom . meta ) ;
672+ expect ( file2 . custom ) . not . toBe ( file . custom ) ;
673+ expect ( file2 . custom . meta ) . not . toBe ( file . custom . meta ) ;
676674 expect ( file2 . custom ) . toEqual ( file . custom ) ;
677675 done ( ) ;
678676 } ) ;
@@ -696,7 +694,7 @@ describe('File', function() {
696694 var file2 = file . clone ( ) ;
697695
698696 expect ( file2 . history ) . toEqual ( history ) ;
699- expect ( file2 . history ) . toNotBe ( file . history ) ;
697+ expect ( file2 . history ) . not . toBe ( file . history ) ;
700698 expect ( file2 . path ) . toEqual ( history [ 2 ] ) ;
701699 done ( ) ;
702700 } ) ;
@@ -714,21 +712,21 @@ describe('File', function() {
714712
715713 var file2 = file . clone ( ) ;
716714 expect ( file2 . custom ) . toEqual ( file . custom ) ;
717- expect ( file2 . custom ) . toNotBe ( file . custom ) ;
715+ expect ( file2 . custom ) . not . toBe ( file . custom ) ;
718716 expect ( file2 . custom . meta ) . toEqual ( file . custom . meta ) ;
719- expect ( file2 . custom . meta ) . toNotBe ( file . custom . meta ) ;
717+ expect ( file2 . custom . meta ) . not . toBe ( file . custom . meta ) ;
720718
721719 var file3 = file . clone ( true ) ;
722720 expect ( file3 . custom ) . toEqual ( file . custom ) ;
723- expect ( file3 . custom ) . toNotBe ( file . custom ) ;
721+ expect ( file3 . custom ) . not . toBe ( file . custom ) ;
724722 expect ( file3 . custom . meta ) . toEqual ( file . custom . meta ) ;
725- expect ( file3 . custom . meta ) . toNotBe ( file . custom . meta ) ;
723+ expect ( file3 . custom . meta ) . not . toBe ( file . custom . meta ) ;
726724
727725 var file4 = file . clone ( { deep : true } ) ;
728726 expect ( file4 . custom ) . toEqual ( file . custom ) ;
729- expect ( file4 . custom ) . toNotBe ( file . custom ) ;
727+ expect ( file4 . custom ) . not . toBe ( file . custom ) ;
730728 expect ( file4 . custom . meta ) . toEqual ( file . custom . meta ) ;
731- expect ( file4 . custom . meta ) . toNotBe ( file . custom . meta ) ;
729+ expect ( file4 . custom . meta ) . not . toBe ( file . custom . meta ) ;
732730
733731 var file5 = file . clone ( false ) ;
734732 expect ( file5 . custom ) . toEqual ( file . custom ) ;
@@ -759,12 +757,12 @@ describe('File', function() {
759757 var file = new ExtendedFile ( ) ;
760758 var file2 = file . clone ( ) ;
761759
762- expect ( file2 ) . toNotBe ( file ) ;
760+ expect ( file2 ) . not . toBe ( file ) ;
763761 expect ( file2 . constructor ) . toBe ( ExtendedFile ) ;
764- expect ( file2 ) . toBeAn ( ExtendedFile ) ;
765- expect ( file2 ) . toBeA ( File ) ;
766- expect ( ExtendedFile . prototype . isPrototypeOf ( file2 ) ) . toEqual ( true ) ;
767- expect ( File . prototype . isPrototypeOf ( file2 ) ) . toEqual ( true ) ;
762+ expect ( file2 ) . toBeInstanceOf ( ExtendedFile ) ;
763+ expect ( file2 ) . toBeInstanceOf ( File ) ;
764+ expect ( Object . prototype . isPrototypeOf . call ( ExtendedFile . prototype , file2 ) ) . toEqual ( true ) ;
765+ expect ( Object . prototype . isPrototypeOf . call ( File . prototype , file2 ) ) . toEqual ( true ) ;
768766 done ( ) ;
769767 } ) ;
770768 } ) ;
@@ -774,18 +772,14 @@ describe('File', function() {
774772 it ( 'returns correct format when no contents and no path' , function ( done ) {
775773 var file = new File ( ) ;
776774 var expectation = '<File >' ;
777- expect ( file . inspect ( ) ) . toEqual ( expectation ) ;
778775 expect ( util . inspect ( file ) ) . toEqual ( expectation ) ;
779- if ( util . inspect . custom ) {
780- expect ( file [ util . inspect . custom ] ( ) ) . toEqual ( expectation ) ;
781- }
782776 done ( ) ;
783777 } ) ;
784778
785779 it ( 'returns correct format when Buffer contents and no path' , function ( done ) {
786780 var val = Buffer . from ( 'test' ) ;
787781 var file = new File ( { contents : val } ) ;
788- expect ( file . inspect ( ) ) . toEqual ( '<File <Buffer 74 65 73 74>>' ) ;
782+ expect ( util . inspect ( file ) ) . toEqual ( '<File <Buffer 74 65 73 74>>' ) ;
789783 done ( ) ;
790784 } ) ;
791785
@@ -797,7 +791,7 @@ describe('File', function() {
797791 path : '/test/test.coffee' ,
798792 contents : val ,
799793 } ) ;
800- expect ( file . inspect ( ) ) . toEqual ( '<File "test.coffee" <Buffer 74 65 73 74>>' ) ;
794+ expect ( util . inspect ( file ) ) . toEqual ( '<File "test.coffee" <Buffer 74 65 73 74>>' ) ;
801795 done ( ) ;
802796 } ) ;
803797
@@ -808,7 +802,7 @@ describe('File', function() {
808802 path : '/test/test.coffee' ,
809803 contents : from ( [ ] ) ,
810804 } ) ;
811- expect ( file . inspect ( ) ) . toEqual ( '<File "test.coffee" <CloneableStream>>' ) ;
805+ expect ( util . inspect ( file ) ) . toEqual ( '<File "test.coffee" <CloneableStream>>' ) ;
812806 done ( ) ;
813807 } ) ;
814808
@@ -819,7 +813,7 @@ describe('File', function() {
819813 path : '/test/test.coffee' ,
820814 contents : null ,
821815 } ) ;
822- expect ( file . inspect ( ) ) . toEqual ( '<File "test.coffee">' ) ;
816+ expect ( util . inspect ( file ) ) . toEqual ( '<File "test.coffee">' ) ;
823817 done ( ) ;
824818 } ) ;
825819 } ) ;
@@ -978,7 +972,7 @@ describe('File', function() {
978972 cwd : '/foo' ,
979973 base : '/bar' ,
980974 } ) ;
981- expect ( file . base ) . toNotEqual ( file . cwd ) ;
975+ expect ( file . base ) . not . toEqual ( file . cwd ) ;
982976 file . base = file . cwd ;
983977 expect ( file . base ) . toEqual ( file . cwd ) ;
984978 done ( ) ;
@@ -989,11 +983,11 @@ describe('File', function() {
989983 cwd : '/foo' ,
990984 base : '/bar' ,
991985 } ) ;
992- expect ( file . base ) . toNotEqual ( file . cwd ) ;
986+ expect ( file . base ) . not . toEqual ( file . cwd ) ;
993987 file . base = null ;
994988 expect ( file . base ) . toEqual ( file . cwd ) ;
995989 file . base = '/bar/' ;
996- expect ( file . base ) . toNotEqual ( file . cwd ) ;
990+ expect ( file . base ) . not . toEqual ( file . cwd ) ;
997991 file . base = undefined ;
998992 expect ( file . base ) . toEqual ( file . cwd ) ;
999993 done ( ) ;
@@ -1205,7 +1199,7 @@ describe('File', function() {
12051199 var file = new File ( ) ;
12061200
12071201 function invalid ( ) {
1208- var a = file . basename ;
1202+ file . basename ;
12091203 }
12101204
12111205 expect ( invalid ) . toThrow ( 'No path specified! Can not get basename.' ) ;
@@ -1518,7 +1512,7 @@ describe('File', function() {
15181512 it ( 'throws on set with null path' , function ( done ) {
15191513 var file = new File ( ) ;
15201514
1521- expect ( file . path ) . toNotExist ( ) ;
1515+ expect ( file . path ) . toBeFalsy ( ) ;
15221516 expect ( file . history ) . toEqual ( [ ] ) ;
15231517
15241518 function invalid ( ) {
0 commit comments