Skip to content

Commit

Permalink
Move to jasmine-browser-runner
Browse files Browse the repository at this point in the history
  • Loading branch information
KludgeKML committed May 5, 2022
1 parent 6fdcc2b commit 0776d8a
Show file tree
Hide file tree
Showing 12 changed files with 541 additions and 181 deletions.
4 changes: 4 additions & 0 deletions .github/dependabot.yml
Original file line number Diff line number Diff line change
Expand Up @@ -35,6 +35,10 @@ updates:
- dependency-name: stylelint-config-gds
dependency-type: direct
# Framework packages
- dependency-name: jasmine-browser-runner
dependency-type: direct
- dependency-name: jasmine-core
dependency-type: direct
- dependency-name: standardx
dependency-type: direct
- dependency-name: stylelint
Expand Down
2 changes: 0 additions & 2 deletions Gemfile
Original file line number Diff line number Diff line change
Expand Up @@ -37,8 +37,6 @@ end
group :development, :test do
gem "byebug"
gem "govuk_test"
gem "jasmine"
gem "jasmine_selenium_runner"
gem "pry"
gem "rubocop-govuk", require: false
end
Expand Down
13 changes: 0 additions & 13 deletions Gemfile.lock
Original file line number Diff line number Diff line change
Expand Up @@ -176,16 +176,6 @@ GEM
i18n (1.10.0)
concurrent-ruby (~> 1.0)
inflection (1.0.0)
jasmine (3.99.0)
jasmine-core (= 3.99.0)
phantomjs
rack (>= 2.1.4)
rake
webrick
jasmine-core (3.99.0)
jasmine_selenium_runner (3.0.0)
jasmine (~> 3.0)
selenium-webdriver (~> 3.8)
json (2.6.1)
json-schema (2.8.1)
addressable (>= 2.4)
Expand Down Expand Up @@ -229,7 +219,6 @@ GEM
parallel (1.22.1)
parser (3.1.2.0)
ast (~> 2.4.1)
phantomjs (2.1.1.0)
plek (4.0.0)
prometheus_exporter (2.0.2)
webrick
Expand Down Expand Up @@ -423,8 +412,6 @@ DEPENDENCIES
govuk_test
htmlentities
httparty
jasmine
jasmine_selenium_runner
json
launchy
listen
Expand Down
2 changes: 1 addition & 1 deletion Rakefile
Original file line number Diff line number Diff line change
Expand Up @@ -8,4 +8,4 @@ Rails.application.load_tasks
# Delete the current "default" rake task and redefine it. This allow us to use:
# - `rake test` to only run minitest tests
Rake::Task[:default].clear if Rake::Task.task_defined?(:default)
task default: %i[lint test js_test security]
task default: %i[lint test jasmine security]
4 changes: 4 additions & 0 deletions lib/tasks/jasmine.rake
Original file line number Diff line number Diff line change
@@ -0,0 +1,4 @@
desc "Run Javascript tests"
task jasmine: [:environment] do
sh "yarn run jasmine:ci"
end
4 changes: 0 additions & 4 deletions lib/tasks/js_test.rake

This file was deleted.

9 changes: 7 additions & 2 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -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": {
Expand All @@ -28,7 +31,9 @@
"extends": "stylelint-config-gds/scss"
},
"dependencies": {
"accessible-autocomplete": "^2.0.3"
"accessible-autocomplete": "^2.0.3",
"jasmine-browser-runner": "^1.0.0",
"jasmine-core": "^4.1.0"
},
"devDependencies": {
"standardx": "^7.0.0",
Expand Down
139 changes: 0 additions & 139 deletions spec/javascripts/support/jasmine.yml

This file was deleted.

7 changes: 0 additions & 7 deletions spec/javascripts/support/jasmine_helper.rb

This file was deleted.

2 changes: 0 additions & 2 deletions spec/javascripts/support/jasmine_selenium_runner.yml

This file was deleted.

21 changes: 21 additions & 0 deletions spec/support/jasmine-browser.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,21 @@
{
"srcDir": "public/assets/smartanswers",
"srcFiles": [
"test-dependencies-*.js",
"application-*.js"
],
"specDir": "spec/javascripts",
"specFiles": [
"**/*[sS]pec.js"
],
"helpers": [
"helpers/*.js",
"vendor/*.js"
],
"env": {
"stopSpecOnExpectationFailure": false,
"stopOnSpecFailure": false,
"random": false
},
"browser": "headlessChrome"
}
Loading

0 comments on commit 0776d8a

Please sign in to comment.