Merge pull request #2783 from alphagov/revert-2771-revert-2763-migrat…

…e-to-jasmine-browser

Re-apply use of jasmine-browser-runner (re-reverts #2771)

.github/dependabot.yml

@@ -18,7 +18,9 @@ updates:
       - dependency-name: rubocop-govuk
         dependency-type: direct
       # Framework gems
-      - dependency-name: jasmine-rails
+      - dependency-name: jasmine-browser-runner
+        dependency-type: direct
+      - dependency-name: jasmine-core
         dependency-type: direct
       - dependency-name: minitest
         dependency-type: direct

Gemfile

@@ -25,8 +25,6 @@ end
 
 group :development, :test do
   gem "govuk_test"
-  gem "jasmine"
-  gem "jasmine_selenium_runner"
   gem "pry"
   gem "rubocop-govuk"
 end

Gemfile.lock

@@ -145,15 +145,7 @@ GEM
       progress (~> 3.0, >= 3.0.1)
     image_size (2.1.0)
     in_threads (1.5.4)
-    jasmine (3.6.0)
-      jasmine-core (~> 3.6.0)
-      phantomjs
-      rack (>= 1.2.1)
-      rake
     jasmine-core (3.6.0)
-    jasmine_selenium_runner (3.0.0)
-      jasmine (~> 3.0)
-      selenium-webdriver (~> 3.8)
     json-schema (2.8.1)
       addressable (>= 2.4)
     kgio (2.11.4)
@@ -194,7 +186,6 @@ GEM
     parallel (1.22.1)
     parser (3.1.2.0)
       ast (~> 2.4.1)
-    phantomjs (2.1.1.0)
     plek (4.0.0)
     progress (3.5.2)
     prometheus_exporter (2.0.3)
@@ -352,9 +343,7 @@ DEPENDENCIES
   govuk_publishing_components
   govuk_test
   image_optim
-  jasmine
   jasmine-core
-  jasmine_selenium_runner
   listen
   minitest
   minitest-capybara

README.md

@@ -30,7 +30,7 @@ bundle exec rake
 To run JavaScript tests (only):
 
 ```
-env RAILS_ENV=test bundle exec rake jasmine:ci
+env RAILS_ENV=test bundle exec rake jasmine
 ```
 
 ### Further documentation

Rakefile

@@ -5,4 +5,4 @@ require File.expand_path("config/application", __dir__)
 Rails.application.load_tasks
 
 Rake::Task[:default].clear if Rake::Task.task_defined?(:default)
-task default: %i[lint jasmine:ci test]
+task default: %i[lint jasmine test]

app/assets/config/manifest.js

@@ -5,3 +5,4 @@
 //= link application.css
 //= link guides-print.css
 //= link print.css
+//= link modules/base-target.js

lib/tasks/jasmine.rake

@@ -0,0 +1,4 @@
+desc "Run Jasmine tests"
+task jasmine: :environment do
+  sh "yarn run jasmine:ci"
+end

package.json

@@ -7,7 +7,10 @@
   "scripts": {
     "lint": "yarn run lint:js && yarn run lint:scss",
     "lint:js": "standardx 'app/assets/javascripts/**/*.js' 'spec/javascripts/**/*.js'",
-    "lint:scss": "stylelint app/assets/stylesheets/"
+    "lint:scss": "stylelint app/assets/stylesheets/",
+    "jasmine:prepare": "RAILS_ENV=test bundle exec rails assets:clobber assets:precompile",
+    "jasmine:ci": "yarn run jasmine:prepare && yarn run jasmine-browser-runner runSpecs",
+    "jasmine:browser": "yarn run jasmine:prepare && yarn run jasmine-browser-runner"
   },
   "standardx": {
     "env": {
@@ -32,6 +35,8 @@
     "extends": "stylelint-config-gds/scss"
   },
   "devDependencies": {
+    "jasmine-browser-runner": "^1.0.0",
+    "jasmine-core": "^4.1.0",
     "standardx": "^7.0.0",
     "stylelint": "^14.8.3",
     "stylelint-config-gds": "^0.2.0"

spec/javascripts/global-bar-init.spec.js

@@ -1,5 +1,3 @@
-// = require global-bar-init
-
 /* global globalBarInit, parseCookie, expectGlobalBarToShow, expectGlobalBarToBeHidden */
 
 describe('Global bar initialize', function () {

spec/javascripts/modules/base-target.spec.js

@@ -1,5 +1,3 @@
-// = require modules/base-target
-
 describe('A base target module', function () {
   'use strict'
 

spec/javascripts/modules/global-bar.spec.js

@@ -6,10 +6,12 @@ describe('Global bar module', function () {
   var element
 
   beforeEach(function () {
+    window.GOVUK.setConsentCookie({ settings: true })
     document.cookie = 'global_bar_seen=; Path=/; Expires=Thu, 01 Jan 1970 00:00:01 GMT;'
   })
 
   afterEach(function () {
+    window.GOVUK.setConsentCookie({ settings: null })
     $('#global-bar').remove()
   })
 

spec/javascripts/surveys.spec.js

@@ -1,6 +1,3 @@
-// = require surveys
-//= require govuk_publishing_components/lib/trigger-event.js
-
 describe('Surveys', function () {
   var surveys = GOVUK.userSurveys
   var $block
@@ -29,6 +26,7 @@ describe('Surveys', function () {
   }
 
   beforeEach(function () {
+    window.GOVUK.setConsentCookie({ settings: true })
     $block = $('<div class="emergency-banner" style="display: none"></div>' +
                '<div id="global-cookie-message" style="display: none"></div>' +
                '<div id="taxonomy-survey" style="display: none"></div>' +
@@ -58,6 +56,7 @@ describe('Surveys', function () {
     })
     $block.remove()
     $('#global-bar').remove()
+    window.GOVUK.setConsentCookie({ settings: null })
   })
 
   describe('init', function () {

spec/support/jasmine-browser.json

@@ -0,0 +1,21 @@
+{
+  "srcDir": "public/assets/static",
+  "srcFiles": [
+    "application-*.js",
+    "modules/base-target-*.js"
+  ],
+  "cssFiles": [
+    "application-*.css"
+  ],
+  "specDir": "spec/javascripts",
+  "specFiles": [
+    "**/*[sS]pec.js"
+  ],
+  "helpers": [
+    "vendor/jquery-1.12.4.js",
+    "vendor/jasmine-jquery-2.0.5.js",
+    "vendor/mock-ajax.js",
+    "helpers/*.js"
+  ],
+  "browser": "headlessChrome"
+}