From 9b4bbbf71bceb3832d920cb69cc01f8c9a3b47ce Mon Sep 17 00:00:00 2001 From: Jeff Williams Date: Thu, 26 Dec 2013 13:00:00 -0800 Subject: [PATCH] formatting --- test/specs/jsdoc/src/filter.js | 14 +++++++------- test/specs/jsdoc/src/scanner.js | 21 ++++++++++++--------- 2 files changed, 19 insertions(+), 16 deletions(-) diff --git a/test/specs/jsdoc/src/filter.js b/test/specs/jsdoc/src/filter.js index 5aa7e904..5781d63b 100644 --- a/test/specs/jsdoc/src/filter.js +++ b/test/specs/jsdoc/src/filter.js @@ -1,10 +1,10 @@ -/*global describe: true, expect: true, it: true */ -describe("jsdoc/src/filter", function() { +/*global describe, expect, it */ +describe('jsdoc/src/filter', function() { var path = require('jsdoc/path'); var filter = new (require('jsdoc/src/filter').Filter)({ - includePattern: new RegExp(".+\\.js(doc)?$"), - excludePattern: new RegExp("(^|\\/|\\\\)_"), + includePattern: new RegExp('.+\\.js(doc)?$'), + excludePattern: new RegExp('(^|\\/|\\\\)_'), exclude: ['.ignore', 'scratch/conf.js'] }); @@ -20,9 +20,9 @@ describe("jsdoc/src/filter", function() { return filter.isIncluded($); }); - it("should return the correct source files", function() { + it('should return the correct source files', function() { expect(files.length).toEqual(2); - expect(files.indexOf("yes.js")).toBeGreaterThan(-1); - expect(files.indexOf("/yes.jsdoc")).toBeGreaterThan(-1); + expect( files.indexOf('yes.js') ).toBeGreaterThan(-1); + expect( files.indexOf('/yes.jsdoc') ).toBeGreaterThan(-1); }); }); diff --git a/test/specs/jsdoc/src/scanner.js b/test/specs/jsdoc/src/scanner.js index 9756f4ce..c5686731 100644 --- a/test/specs/jsdoc/src/scanner.js +++ b/test/specs/jsdoc/src/scanner.js @@ -1,10 +1,10 @@ -/*global describe: true, env: true, expect: true, it: true */ -describe("jsdoc/src/scanner", function() { - var path = require('path'); +/*global describe, env, expect, it */ +describe('jsdoc/src/scanner', function() { + var path = require('jsdoc/path'); var filter = new (require('jsdoc/src/filter').Filter)({ - includePattern: new RegExp(".+\\.js(doc)?$"), - excludePattern: new RegExp("(^|\\/|\\\\)_") + includePattern: new RegExp('.+\\.js(doc)?$'), + excludePattern: new RegExp('(^|\\/|\\\\)_') }); var scanner = new (require('jsdoc/src/scanner').Scanner)(); var sourcePath = path.normalize(env.pwd + '/test/fixtures/src'); @@ -14,10 +14,13 @@ describe("jsdoc/src/scanner", function() { return path.relative(env.pwd, $); }); - it("should return the correct source files", function() { + it('should return the correct source files', function() { expect(sourceFiles.length).toEqual(3); - expect(sourceFiles.indexOf(path.join('test', 'fixtures', 'src', 'one.js'))).toBeGreaterThan(-1); - expect(sourceFiles.indexOf(path.join('test', 'fixtures', 'src', 'two.js'))).toBeGreaterThan(-1); - expect(sourceFiles.indexOf(path.join('test', 'fixtures', 'src', 'dir1', 'three.js'))).toBeGreaterThan(-1); + expect( sourceFiles.indexOf(path.join('test', 'fixtures', 'src', 'one.js')) ) + .toBeGreaterThan(-1); + expect( sourceFiles.indexOf(path.join('test', 'fixtures', 'src', 'two.js')) ) + .toBeGreaterThan(-1); + expect( sourceFiles.indexOf(path.join('test', 'fixtures', 'src', 'dir1', 'three.js')) ) + .toBeGreaterThan(-1); }); }); \ No newline at end of file