Remove irrelevant use of done from non-asynchronous tests

Author: kadamwhite

test/patch_wordpress_test.js

@@ -8,26 +8,23 @@ var grunt = require( 'grunt' ),
 
 describe( 'grunt_patch_wordpress', function() {
 	describe( 'sanity checks', function() {
-		it( 'a is a', function( done ) {
+		it( 'a is a', function() {
 			expect( 'a' ).toEqual( 'a' );
-			done();
 		});
 
 	});
 
-	it( 'convertToRaw converts urls', function( done ) {
+	it( 'convertToRaw converts urls', function() {
 		expect( trac.convertToRaw ( url.parse( 'https://core.trac.wordpress.org/attachment/ticket/26700/26700.diff'  ) ) ).toEqual( 'https://core.trac.wordpress.org/raw-attachment/ticket/26700/26700.diff' );
-		done();
 	});
 
 	describe( 'Level Calculator', function() {
 
 		// @TODO: Find alot of patches to use here
 
-		it ( '26602.2.diff is 0', function( done ) {
+		it ( '26602.2.diff is 0', function() {
 			var file = grunt.file.read( 'test/fixtures/26602.2.diff' );
 			expect( patch.isAb( file ) ).toBe( false );
-			done();
 		});
 	});
 

test/patches.js

@@ -17,83 +17,60 @@ var grunt = require( 'grunt' ),
 
 describe( 'Patch helpers', function() {
 
-	it( 'git a/b diffs should not automatticaly trigger moving to src', function( done ) {
+	it( 'git a/b diffs should not automatticaly trigger moving to src', function() {
 		expect( patch.moveToSrc( abyes ) ).not.toBe( true );
-
-		done();
 	});
 
-	it( 'tests diffs should always be applied in the root of the checkout', function( done ) {
+	it( 'tests diffs should always be applied in the root of the checkout', function() {
 
 		expect( patch.moveToSrc( testsGit ) ).not.toBe( true );
 		expect( patch.moveToSrc( testsSvn ) ).not.toBe( true );
-
-		done();
 	});
 
-	it( 'dev.git diffs should always be applied in the root of the checkout', function( done ) {
+	it( 'dev.git diffs should always be applied in the root of the checkout', function() {
 
 		expect( patch.moveToSrc( developGit ) ).not.toBe( true );
 		expect( patch.moveToSrc( developIndexGit ) ).not.toBe( true );
-
-		done();
 	});
 
-	it( 'dev.svn diffs should always be applied in the root of the checkout', function( done ) {
+	it( 'dev.svn diffs should always be applied in the root of the checkout', function() {
 
 		expect( patch.moveToSrc( developSvn ) ).not.toBe( true );
 		expect( patch.moveToSrc( developIndexSvn ) ).not.toBe( true );
-
-		done();
 	});
 
-	it( 'core.git.wordpress.org diffs should always be applied in the svn folder', function( done ) {
+	it( 'core.git.wordpress.org diffs should always be applied in the svn folder', function() {
 
 		expect( patch.moveToSrc( coreGit ) ).toBe( true );
-
-		done();
 	});
 
-	it( 'core.svn.wordpress.org diffs should always be applied in the svn folder', function( done ) {
+	it( 'core.svn.wordpress.org diffs should always be applied in the svn folder', function() {
 
 		expect( patch.moveToSrc( coreSvn ) ).toBe( true );
-
-		done();
 	});
 
-	it( 'core.svn.wordpress.org diffs from trunk should always be applied in the src folder', function( done ) {
+	it( 'core.svn.wordpress.org diffs from trunk should always be applied in the src folder', function() {
 
 		expect( patch.moveToSrc( coreTrunkSvn ) ).toBe( true );
 		expect( patch.isAb( coreTrunkSvn ) ).toBe( true );
-
-		done();
 	});
 
-	it( 'index.php should always be applied in the src folder', function( done ) {
-
+	it( 'index.php should always be applied in the src folder', function() {
 		expect( patch.moveToSrc( coreIndexSvn ) ).toBe( true );
 		expect( patch.moveToSrc( coreIndexGit ) ).toBe( true );
-
-		done();
-
 	});
 
-	it( 'wp-config-sample.php should always be applied in the root folder', function( done ) {
+	it( 'wp-config-sample.php should always be applied in the root folder', function() {
 		expect( patch.moveToSrc( developSampleSvn ) ).not.toBe( true );
 		expect( patch.moveToSrc( developSampleGit ) ).not.toBe( true );
-
-		done();
-
 	});
 
-	it ( 'isAb should return true on patches with a/ b/ style', function( done ) {
+	it ( 'isAb should return true on patches with a/ b/ style', function() {
 
 		expect( patch.isAb( abyes ) ).toBe( true );
-
-		done();
 	});
 
-	it ( 'isAb should return false on patches without a/ b/ style', function( done ) {
+	it ( 'isAb should return false on patches without a/ b/ style', function() {
 
 		expect( patch.isAb( developSampleGit ) ).not.toBe( true );
 		expect( patch.isAb( developSampleSvn ) ).not.toBe( true );
@@ -107,8 +84,6 @@ describe( 'Patch helpers', function() {
 		expect( patch.isAb( developIndexSvn ) ).not.toBe( true );
 		expect( patch.isAb( testsGit ) ).not.toBe( true );
 		expect( patch.isAb( testsSvn ) ).not.toBe( true );
-
-		done();
 	});
 
 });

test/regex.js

@@ -5,44 +5,38 @@ var grunt = require( 'grunt' ),
 	html23994 = grunt.file.read ( 'test/fixtures/23994.html' );
 
 describe( 'regular expressions', function() {
-	it( 'multiple patches on a ticket with non patches as well', function( done ) {
+	it( 'multiple patches on a ticket with non patches as well', function() {
 		var matches = regex.patchAttachments( html23988 ),
 			longMatches = regex.longMatches( html23988 ),
 			possiblePatches = regex.possiblePatches( longMatches );
 
 		expect( matches.length ).toBe( 2 );
 		expect( longMatches.length ).toBe( 4 );
 		expect( possiblePatches.length ).toBe( 2 );
-
-		done();
 	});
 
-	it( 'one patch on a ticket', function( done ) {
+	it( 'one patch on a ticket', function() {
 		var matches = regex.patchAttachments( html23994 );
 
 		expect( matches.length ).toBe( 1 );
-		done();
 	});
 
-	it( 'url from a list of attachments', function( done ) {
+	it( 'url from a list of attachments', function() {
 		var matches = regex.patchAttachments( html23994 );
 		url = 'core.trac.wordpress.org' + regex.urlsFromAttachmentList(   matches[0])[1];
 
 		expect( url ).toBe( 'core.trac.wordpress.org/attachment/ticket/23994/23994.diff' );
-		done();
 	});
 
-	it( 'no patches on a ticket', function( done ) {
+	it( 'no patches on a ticket', function() {
 		var matches = regex.patchAttachments( html23989 );
 
 		expect( matches ).toBeNull();
-		done();
 	});
 
-	it( 'filenames should be cleaned', function( done ) {
+	it( 'filenames should be cleaned', function() {
 		var filename = '?       one.diff';
 
 		expect( regex.localFileClean( filename ) ).toEqual( 'one.diff' );
-		done();
 	});
 });