Merge pull request #311 from alphagov/add-test-for-procfile

Reorder grunt tasks, remove the Procfile, remove grunt-shell dependency
alphagov · Sep 19, 2016 · b460612 · b460612
2 parents 447f468 + 38b1f24
commit b460612
Show file tree

Hide file tree

Showing 3 changed files with 20 additions and 65 deletions.
diff --git a/Gruntfile.js b/Gruntfile.js
@@ -111,16 +111,6 @@ module.exports = function (grunt) {
           logConcurrentOutput: true
         }
       }
-    },
-
-    // Lint scss files
-    shell: {
-      multiple: {
-        command: [
-          'bundle',
-          'bundle exec govuk-lint-sass public/sass/elements/'
-        ].join('&&')
-      }
     }
 
   })
@@ -132,66 +122,31 @@ module.exports = function (grunt) {
     'grunt-sass',
     'grunt-nodemon',
     'grunt-concurrent',
-    'grunt-shell',
     'grunt-htmlentities'
   ].forEach(function (task) {
     grunt.loadNpmTasks(task)
   })
 
-  grunt.registerTask('default', [
-    'clean',
-    'copy',
-    'encode_snippets',
-    'sass',
-    'concurrent:target'
-  ])
-
-  grunt.registerTask(
-    'test_default',
-    'Test that the default task runs the app',
-    [
-      'copy',
-      'sass'
-    ]
-  )
+  grunt.registerTask('default', ['clean', 'copy', 'encode-snippets', 'sass', 'concurrent:target'])
 
-  grunt.registerTask(
-    'encode_snippets',
-    'Encode HTML snippets',
-    function () {
-      grunt.task.run('htmlentities')
-    }
-  )
-
-  grunt.registerTask(
-    'lint',
-    'Use govuk-scss-lint to lint the sass files',
-    function () {
-      grunt.task.run('shell', 'lint_message')
-    }
-  )
+  // Encode HTML snippets
+  grunt.registerTask('encode-snippets', ['htmlentities', 'encode-snippets-success'])
+  grunt.registerTask('encode-snippets-success', function () {
+    grunt.log.writeln('HTML snippets encoded.'['yellow'].bold)
+  })
 
-  grunt.registerTask(
-    'lint_message',
-    'Output a message once linting is complete',
-    function () {
-      grunt.log.write('scss lint is complete, without errors.')
-    }
-  )
+  // Tests
+  grunt.registerTask('test', ['lint', 'test-default', 'test-success'])
+  grunt.registerTask('test-success', function () {
+    grunt.log.writeln('The tests are complete and the app runs, without errors.'['yellow'].bold)
+  })
 
-  grunt.registerTask(
-    'test',
-    'Lint the Sass files, then check the app runs',
-    function () {
-      grunt.task.run('lint', 'test_default', 'test_message')
-    }
-  )
+  // 1. Use govuk-scss-lint to lint the sass files
+  grunt.registerTask('lint', ['lint-success'])
+  grunt.registerTask('lint-success', function () {
+    grunt.log.writeln('Scss lint is complete, without errors.'['yellow'].bold)
+  })
 
-  grunt.registerTask(
-    'test_message',
-    'Output a message once the tests are complete',
-    function () {
-      grunt.log.write('scss lint is complete and the app runs, without errors.')
-    }
-  )
+  // 2. Test that the default grunt task runs the app
+  grunt.registerTask('test-default', ['clean', 'copy', 'encode-snippets', 'sass'])
 }
diff --git a/Procfile b/Procfile
diff --git a/package.json b/package.json
@@ -32,7 +32,8 @@
     "standard": "^7.1.2"
   },
   "scripts": {
-    "test": "standard && grunt test",
+    "test": "standard && grunt test && npm run lint --silent",
+    "lint": "bundle && bundle exec govuk-lint-sass public/sass/elements/",
     "start": "grunt"
   },
   "standard": {