Stop linting submodules, fix test

FreeCodeCamp · 65fb85a71ff1a4d0285680d6644af27a12fb244f · ltegman committed Feb 12, 2016 · Feb 12, 2016 · 65fb85a
1 parent 7f1a19c
commit 65fb85a71ff1a4d0285680d6644af27a12fb244f
Unified Split

Showing with 6 additions and 3 deletions.

+5 −2 gulpfile.js

+1 −1 test/TextLib.spec.js
@@ -6,8 +6,11 @@ const gulp = require('gulp'),
 
 require('dotenv').config({path: 'dot.env'});
 
+const scripts = ['config/*.js', 'data/rooms/*.js', 'data/*.js', 'lib/**/*.js',
+                  'test/*.js', 'app.js', 'gulpfile.js'];
+
 gulp.task('lint', () => {
-    return gulp.src(['**/*.js', '!node_modules/**'])
+    return gulp.src(scripts)
         .pipe(eslint())
         .pipe(eslint.format());
 });
@@ -28,7 +31,7 @@ gulp.task('set-env', () => {
 });
 
 gulp.task('watch', () => {
-  gulp.watch('./**/*.js', ['lint', 'test']);
+  gulp.watch(scripts, ['lint', 'test']);
 });
 
 gulp.task('default', ['lint', 'test', 'watch'], () => {
@@ -44,7 +44,7 @@ test('TextLib tests', t => {
     st.equal(split.length, 12, 'should have trimmed correct number of lines');
     st.ok(split[0].includes('Hi, I\'m **[CamperBot'),
           'first line should be correct');
-    st.equal(split[split.length - 1], '',
+    st.equal(split[split.length - 1], '\r',
           'last line should be correct');
     st.end();
   });