Merge pull request #752 from integer32llc/redo-ci

Author: shepmaster

.github/workflows/ci.yml

@@ -3,8 +3,6 @@
 name: Validate everything
 'on':
   push:
-    branches:
-    - master
   pull_request_target:
     types:
     - labeled
@@ -218,6 +216,8 @@ jobs:
       run: yarn --cwd ui/frontend/ test
     - name: Lint
       run: yarn --cwd ui/frontend/ test:lint
+    - name: Style
+      run: yarn --cwd ui/frontend/ test:style
     - name: Build frontend
       run: yarn --cwd ui/frontend/ run build:production
     - name: Save frontend artifact
@@ -243,9 +243,9 @@ jobs:
       with:
         ref: "${{ github.event.pull_request.head.sha }}"
     - name: Configure Ruby
-      uses: actions/setup-ruby@v1
+      uses: ruby/setup-ruby@v1
       with:
-        ruby-version: '2.7'
+        ruby-version: 3.0.2
     - name: Cache bundler intermediate products
       uses: actions/cache@v2
       with:

ci/Gemfile

@@ -1,3 +1,3 @@
 # frozen_string_literal: true
 source "https://rubygems.org"
-ruby "2.7.2"
+ruby "3.0.2"

ci/workflows.yml

@@ -218,8 +218,6 @@ workflows:
 
     'on':
       push:
-        branches:
-          - master
       pull_request_target:
         types: [labeled]
         branches:
@@ -368,9 +366,9 @@ workflows:
           - *checkout_pr
 
           - name: "Configure Ruby"
-            uses: actions/setup-ruby@v1
+            uses: ruby/setup-ruby@v1
             with:
-              ruby-version: '2.7'
+              ruby-version: '3.0.2'
 
           - name: "Cache bundler intermediate products"
             uses: actions/cache@v2

tests/Gemfile

@@ -1,9 +1,9 @@
 # frozen_string_literal: true
-source "https://rubygems.org"
-ruby "2.7.4"
+source 'https://rubygems.org'
+ruby '3.0.2'
 
-gem "capybara"
-gem "rspec"
-gem 'capybara-screenshot'
-gem 'selenium-webdriver'
-gem 'webdrivers'
+gem 'capybara', '~> 3.35'
+gem 'rspec', '~> 3.10'
+gem 'capybara-screenshot', '~> 1.0'
+gem 'selenium-webdriver', '~> 4.0'
+gem 'webdrivers', '~> 5.0'

tests/Gemfile.lock

@@ -3,8 +3,9 @@ GEM
   specs:
     addressable (2.8.0)
       public_suffix (>= 2.0.2, < 5.0)
-    capybara (3.35.3)
+    capybara (3.36.0)
       addressable
+      matrix
       mini_mime (>= 0.1.3)
       nokogiri (~> 1.8)
       rack (>= 1.6.0)
@@ -14,21 +15,23 @@ GEM
     capybara-screenshot (1.0.25)
       capybara (>= 1.0, < 4)
       launchy
-    childprocess (3.0.0)
+    childprocess (4.1.0)
     diff-lcs (1.4.4)
     launchy (2.5.0)
       addressable (~> 2.7)
-    mini_mime (1.1.1)
+    matrix (0.4.2)
+    mini_mime (1.1.2)
     mini_portile2 (2.6.1)
-    nokogiri (1.12.4)
+    nokogiri (1.12.5)
       mini_portile2 (~> 2.6.1)
       racc (~> 1.4)
     public_suffix (4.0.6)
-    racc (1.5.2)
+    racc (1.6.0)
     rack (2.2.3)
     rack-test (1.1.0)
       rack (>= 1.0, < 3)
     regexp_parser (2.1.1)
+    rexml (3.2.5)
     rspec (3.10.0)
       rspec-core (~> 3.10.0)
       rspec-expectations (~> 3.10.0)
@@ -41,30 +44,31 @@ GEM
     rspec-mocks (3.10.2)
       diff-lcs (>= 1.2.0, < 2.0)
       rspec-support (~> 3.10.0)
-    rspec-support (3.10.2)
+    rspec-support (3.10.3)
     rubyzip (2.3.2)
-    selenium-webdriver (3.142.7)
-      childprocess (>= 0.5, < 4.0)
+    selenium-webdriver (4.0.3)
+      childprocess (>= 0.5, < 5.0)
+      rexml (~> 3.2, >= 3.2.5)
       rubyzip (>= 1.2.2)
-    webdrivers (4.6.1)
+    webdrivers (5.0.0)
       nokogiri (~> 1.6)
       rubyzip (>= 1.3.0)
-      selenium-webdriver (>= 3.0, < 4.0)
+      selenium-webdriver (~> 4.0)
     xpath (3.2.0)
       nokogiri (~> 1.8)
 
 PLATFORMS
   ruby
 
 DEPENDENCIES
-  capybara
-  capybara-screenshot
-  rspec
-  selenium-webdriver
-  webdrivers
+  capybara (~> 3.35)
+  capybara-screenshot (~> 1.0)
+  rspec (~> 3.10)
+  selenium-webdriver (~> 4.0)
+  webdrivers (~> 5.0)
 
 RUBY VERSION
-   ruby 2.7.4p191
+   ruby 3.0.2p107
 
 BUNDLED WITH
-   2.1.4
+   2.2.30

tests/spec/spec_helper.rb

@@ -42,14 +42,14 @@
   options = {}
   options[:log_level] = :trace if capture_js_log
 
-  browser_options = ::Selenium::WebDriver::Firefox::Options.new(options)
+  browser_options = ::Selenium::WebDriver::Firefox::Options.new(**options)
   browser_options.headless! if ENV.fetch('HEADLESS', 'true').casecmp?('true')
   browser_options.add_preference('devtools.console.stdout.content', true) if capture_js_log
 
   Capybara::Selenium::Driver.new(
     app,
     browser: :firefox,
-    options: browser_options,
+    capabilities: browser_options,
     clear_local_storage: true,
     clear_session_storage: true,
   )

ui/frontend/.stylelintrc.json

@@ -2,7 +2,8 @@
   "extends": [
     "stylelint-config-standard",
     "stylelint-config-css-modules",
-    "stylelint-config-idiomatic-order"
+    "stylelint-config-idiomatic-order",
+    "stylelint-config-prettier"
   ],
   "rules": {
     "value-keyword-case": ["lower", {

ui/frontend/Output/Gist.module.css

@@ -13,9 +13,7 @@ $copied-duration: 1s ease-in-out;
 
 .text {
   opacity: 0;
-  transition:
-    visibility $copied-duration,
-    opacity $copied-duration,
+  transition: visibility $copied-duration, opacity $copied-duration,
     color $copied-duration;
   visibility: hidden;
 }

ui/frontend/package.json

@@ -67,6 +67,7 @@
     "stylelint": "^13.12.0",
     "stylelint-config-css-modules": "^2.2.0",
     "stylelint-config-idiomatic-order": "^8.1.0",
+    "stylelint-config-prettier": "^9.0.3",
     "stylelint-config-standard": "^22.0.0",
     "ts-jest": "^27.0.0",
     "ts-loader": "^9.2.3",

ui/frontend/yarn.lock

@@ -6136,6 +6136,11 @@ stylelint-config-idiomatic-order@^8.1.0:
   dependencies:
     stylelint-order "^3.1.1"
 
+stylelint-config-prettier@^9.0.3:
+  version "9.0.3"
+  resolved "https://registry.yarnpkg.com/stylelint-config-prettier/-/stylelint-config-prettier-9.0.3.tgz#0dccebeff359dcc393c9229184408b08964d561c"
+  integrity sha512-5n9gUDp/n5tTMCq1GLqSpA30w2sqWITSSEiAWQlpxkKGAUbjcemQ0nbkRvRUa0B1LgD3+hCvdL7B1eTxy1QHJg==
+
 stylelint-config-recommended@^5.0.0:
   version "5.0.0"
   resolved "https://registry.yarnpkg.com/stylelint-config-recommended/-/stylelint-config-recommended-5.0.0.tgz#fb5653f495a60b4938f2ad3e77712d9e1039ae78"