Rails 7 Update #5874

KludgeKML · 2022-04-13T14:03:29Z

⚠️ This repo is Continuously Deployed: make sure you follow the guidance ⚠️

Gemfile

edwardkerry

This looks OK to me - a couple of questions but not blockers.
I notice the heroku app has failed to deploy but think that is a Heroku issue. Has it been deployed/tested on Integration?

edwardkerry · 2022-04-26T09:24:18Z

spec/support/jasmine-browser.json

@@ -2,7 +2,8 @@
  "srcDir": "public/assets",
  "srcFiles": [
    "**/*.js",
-    "!express/**/*.js"
+    "!express/**/*.js",
+    "!**/visualise-*.js"


Do we have a note or card somewhere to remind us to add this back when possible?

edwardkerry · 2022-04-26T09:26:25Z

lib/support_ticket.rb

-      tags: TAGS,
-      comment: { body: body },
-    })
+    self.class.client.zendesk_client.tickets.create!(payload)


this seems to be undoing a change from the Fix deprecation notices commit. Is it possible to remove the change from that commit?

It's... not quite undoing it (you'll see that the end result is slightly different), but yeah, I might be able to tinker with the commits to go straight from the original version to this, let me see if I can do that.

including visualise.js causes the test suite to fail even though all the tests pass because it relies on adjacencyList (not present as the suite loads because in production it's provided by the HTML). Since we're not testing this yet, remove for the moment.

kevindew

Excuse my drive by review - I get email notifications as I think I already commented. I thought I'd offer some suggestions having worked on a few JS testing and sprockets things.

kevindew · 2022-04-26T15:30:06Z

app/assets/config/manifest.js

+//= link accessible-autocomplete/dist/accessible-autocomplete.min.css
+//= link application.css
+//= link print.css
+//= link joint.css
+//= link visualise.css
+//= link accessible-autocomplete/dist/accessible-autocomplete.min.js
+//= link application.js
+//= link dagre.js
+//= link joint.layout.DirectedGraph.js
+//= link joint.js
+//= link joint.patch.js
+//= link test-dependencies.js
+//= link visualise.js


I imagine you can simplify this a little:

//= link_directory ./stylesheets //= link joint.css //= link application.js //= link dagre.js //= link joint.layout.DirectedGraph.js //= link joint.js //= link joint.patch.js //= link test-dependencies.js //= link visualise.js

You should also remove the assets_precompile stuff from

smart-answers/config/initializers/assets.rb

Lines 14 to 18 in d3fc1b1

Rails.application.config.assets.precompile += %w[

test-dependencies.js

accessible-autocomplete/dist/accessible-autocomplete.min.js

accessible-autocomplete/dist/accessible-autocomplete.min.css

]

and

smart-answers/config/application.rb

Lines 63 to 72 in d3fc1b1

config.assets.precompile += %w[

joint.patch.js

joint.js

joint.layout.DirectedGraph.js

joint.css

print.css

dagre.js

visualise.js

visualise.css

]

A couple of suggestions that could make this part of the update a little easier are:

Do the sprockets update as part of the dependabot PR: Bump govuk_publishing_components from 28.9.2 to 29.5.0 #5879 (which updates Sprockets) so you can separate it out from the Rails 7 stuff

Perhaps use asset-pipeline to require the various joint.* js files from visualise.js, I don't think they're used anywhere else.

kevindew · 2022-04-26T15:34:09Z

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": "bundle exec rake assets:precompile",


Suggested change

"jasmine:prepare": "bundle exec rake assets:precompile",

"jasmine:prepare": "RAILS_ENV=test bundle exec rails assets:clobber assets:precompile",",

This brings it into convention with our other apps. The clobber is needed otherwise the same JS files will get included twice if a JS file is changed :(

kevindew · 2022-04-26T15:37:32Z

package.json

-    "lint:scss": "stylelint app/assets/stylesheets/"
+    "lint:scss": "stylelint app/assets/stylesheets/",
+    "jasmine:prepare": "bundle exec rake assets:precompile",
+    "jasmine:ci": "yarn run jasmine:prepare && PATH=~/.webdrivers:$PATH yarn run jasmine-browser-runner runSpecs",


Suggested change

"jasmine:ci": "yarn run jasmine:prepare && PATH=~/.webdrivers:$PATH yarn run jasmine-browser-runner runSpecs",

"jasmine:ci": "yarn run jasmine:prepare && yarn run jasmine-browser-runner runSpecs",

This suggestion is for consistency with our other apps: https://github.com/alphagov/content-publisher/blob/6511019bc2313b1cea3f1fcd7f5e77aef6913368/package.json#L12

This app doesn't have the webdrivers gem (it was removed from GOV.UK test) alphagov/govuk_test#43

kevindew · 2022-04-26T15:39:06Z

spec/support/jasmine-browser.json

+  "srcFiles": [
+    "**/*.js",
+    "!express/**/*.js",
+    "!**/visualise-*.js"


I reckon you could change this to be:

Suggested change

"srcFiles": [

"**/*.js",

"!express/**/*.js",

"!**/visualise-*.js"

"srcFiles": [

"test-dependencies-*.js",

"application-*.js"

As I think they are the only JS files involved in testing (all the visualise and joint stuff seem to be separate libraries for one distinct page)

KludgeKML · 2022-05-05T11:21:12Z

Superceded by: #5892

govuk-ci temporarily deployed to smart-answer-rails-7-3qkbqftr8 April 13, 2022 14:03 Inactive

kevindew reviewed Apr 13, 2022

View reviewed changes

Gemfile Outdated Show resolved Hide resolved

govuk-ci temporarily deployed to smart-answer-rails-7-nmepwa8ky April 14, 2022 11:06 Inactive

govuk-ci temporarily deployed to smart-answer-rails-7-8akl1ewmz April 14, 2022 12:28 Inactive

govuk-ci had a problem deploying to smart-answer-rails-7-hisb0v1f1 April 14, 2022 15:24 Failure

govuk-ci temporarily deployed to smart-answer-rails-7-hisb0v1f1 April 14, 2022 15:26 Inactive

govuk-ci had a problem deploying to smart-answer-rails-7-ol7smajcd April 14, 2022 15:40 Failure

KludgeKML force-pushed the rails-7 branch from 2c988da to fb02ba7 Compare April 20, 2022 16:28

KludgeKML changed the title ~~[DO NOT MERGE] Rails 7 Update~~ Rails 7 Update Apr 20, 2022

KludgeKML requested review from edwardkerry and 1pretz1 April 20, 2022 16:29

edwardkerry approved these changes Apr 26, 2022

View reviewed changes

KludgeKML added 12 commits April 26, 2022 13:59

Run rails app:update

6be8396

Move JS tests from Jasmine gem to Jasmine Browser Runner

3884500

Fix deprecation notices

eb51723

Allow minitest to run rake tests again

72a6add

Update other gems.

df417c8

Create manifest.js for Sprockets.

2732072

Add jasmine npm packages to dependabot

35d4226

Remove obsolete jasmine config

7c60e96

Enable new Rails 7 configuration

8181481

Rotate SHA1 encrypted cookies to SHA256

715f712

Update gds_zendesk library to avoid private forwarded call.

06280d5

KludgeKML force-pushed the rails-7 branch from fb02ba7 to 06280d5 Compare April 26, 2022 12:59

Update manifest with missing yarn modules

7944c56

kevindew reviewed Apr 26, 2022

View reviewed changes

KludgeKML closed this May 5, 2022

KludgeKML deleted the rails-7 branch February 2, 2023 15:14

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Rails 7 Update #5874

Rails 7 Update #5874

KludgeKML commented Apr 13, 2022 •

edited

Loading

edwardkerry left a comment

edwardkerry Apr 26, 2022

edwardkerry Apr 26, 2022

KludgeKML Apr 26, 2022

kevindew left a comment

kevindew Apr 26, 2022

kevindew Apr 26, 2022

kevindew Apr 26, 2022

kevindew Apr 26, 2022

KludgeKML commented May 5, 2022

	Rails.application.config.assets.precompile += %w[
	test-dependencies.js
	accessible-autocomplete/dist/accessible-autocomplete.min.js
	accessible-autocomplete/dist/accessible-autocomplete.min.css
	]

	config.assets.precompile += %w[
	joint.patch.js
	joint.js
	joint.layout.DirectedGraph.js
	joint.css
	print.css
	dagre.js
	visualise.js
	visualise.css
	]

	"jasmine:prepare": "bundle exec rake assets:precompile",
	"jasmine:prepare": "RAILS_ENV=test bundle exec rails assets:clobber assets:precompile",",

	"jasmine:ci": "yarn run jasmine:prepare && PATH=~/.webdrivers:$PATH yarn run jasmine-browser-runner runSpecs",
	"jasmine:ci": "yarn run jasmine:prepare && yarn run jasmine-browser-runner runSpecs",

Rails 7 Update #5874

Rails 7 Update #5874

Conversation

KludgeKML commented Apr 13, 2022 • edited Loading

edwardkerry left a comment

Choose a reason for hiding this comment

edwardkerry Apr 26, 2022

Choose a reason for hiding this comment

edwardkerry Apr 26, 2022

Choose a reason for hiding this comment

KludgeKML Apr 26, 2022

Choose a reason for hiding this comment

kevindew left a comment

Choose a reason for hiding this comment

kevindew Apr 26, 2022

Choose a reason for hiding this comment

kevindew Apr 26, 2022

Choose a reason for hiding this comment

kevindew Apr 26, 2022

Choose a reason for hiding this comment

kevindew Apr 26, 2022

Choose a reason for hiding this comment

KludgeKML commented May 5, 2022

KludgeKML commented Apr 13, 2022 •

edited

Loading