Merge tag 'v1.6.35'

# Conflicts:
#	Gemfile.lock

.github/workflows/_run_super_scaffolding_tests.yml

@@ -128,7 +128,7 @@ jobs:
           CIRCLE_NODE_INDEX: ${{ strategy.job-index }}
 
       - name: 'Run Super Scaffolding Test'
-        run: bundle exec rails test test/system/super_scaffolding/super_scaffolding_test.rb test/system/super_scaffolding/partial_test.rb test/controllers/webhooks/incoming/some_provider_webhooks_controller_test.rb
+        run: bin/rails test test/system/super_scaffolding/ test/controllers/webhooks/incoming/some_provider_webhooks_controller_test.rb
         working-directory: tmp/starter
 
       - name: Test Summary

Gemfile

@@ -112,7 +112,7 @@ end
 
 # We use a constant here so that we can ensure that all of the bullet_train-*
 # packages are on the same version.
-BULLET_TRAIN_VERSION = "1.6.34"
+BULLET_TRAIN_VERSION = "1.6.35"
 
 # Core packages.
 gem "bullet_train", BULLET_TRAIN_VERSION

Gemfile.lock

@@ -127,7 +127,7 @@ GEM
     bootsnap (1.17.1)
       msgpack (~> 1.2)
     builder (3.2.4)
-    bullet_train (1.6.34)
+    bullet_train (1.6.35)
       awesome_print
       bullet_train-has_uuid
       bullet_train-roles
@@ -160,7 +160,7 @@ GEM
       unicode-emoji
       valid_email
       xxhash
-    bullet_train-api (1.6.34)
+    bullet_train-api (1.6.35)
       bullet_train
       bullet_train-super_scaffolding
       colorizer
@@ -171,61 +171,61 @@ GEM
       pagy_cursor
       rack-cors
       rails (>= 6.0.0)
-    bullet_train-fields (1.6.34)
+    bullet_train-fields (1.6.35)
       chronic
       cloudinary
       phonelib
       rails (>= 6.0.0)
-    bullet_train-has_uuid (1.6.34)
+    bullet_train-has_uuid (1.6.35)
       rails (>= 6.0.0)
-    bullet_train-incoming_webhooks (1.6.34)
+    bullet_train-incoming_webhooks (1.6.35)
       bullet_train
       bullet_train-api
       bullet_train-super_scaffolding
       rails (>= 6.0.0)
-    bullet_train-integrations (1.6.34)
+    bullet_train-integrations (1.6.35)
       rails (>= 6.0.0)
-    bullet_train-integrations-stripe (1.6.34)
+    bullet_train-integrations-stripe (1.6.35)
       omniauth
       omniauth-rails_csrf_protection
       omniauth-stripe-connect
       rails (>= 6.0.0)
       stripe
-    bullet_train-obfuscates_id (1.6.34)
+    bullet_train-obfuscates_id (1.6.35)
       hashids
       rails (>= 6.0.0)
-    bullet_train-outgoing_webhooks (1.6.34)
+    bullet_train-outgoing_webhooks (1.6.35)
       public_suffix
       rails (>= 6.0.0)
-    bullet_train-roles (1.6.34)
+    bullet_train-roles (1.6.35)
       active_hash
       activesupport
       cancancan
     bullet_train-routes (1.0.0)
       rails (>= 6.0.0)
-    bullet_train-scope_questions (1.6.34)
+    bullet_train-scope_questions (1.6.35)
       rails (>= 6.0.0)
-    bullet_train-scope_validator (1.6.34)
+    bullet_train-scope_validator (1.6.35)
       rails
-    bullet_train-sortable (1.6.34)
+    bullet_train-sortable (1.6.35)
       rails (>= 6.0.0)
-    bullet_train-super_load_and_authorize_resource (1.6.34)
+    bullet_train-super_load_and_authorize_resource (1.6.35)
       cancancan
       rails (>= 6.0.0)
-    bullet_train-super_scaffolding (1.6.34)
+    bullet_train-super_scaffolding (1.6.35)
       colorizer
       indefinite_article
       masamune-ast (~> 2.0.2)
       rails (>= 6.0.0)
-    bullet_train-themes (1.6.34)
+    bullet_train-themes (1.6.35)
       bullet_train-fields
       nice_partials (~> 0.9)
       rails (>= 6.0.0)
-    bullet_train-themes-light (1.6.34)
+    bullet_train-themes-light (1.6.35)
       bullet_train-themes-tailwind_css
       masamune-ast (~> 2.0.2)
       rails (>= 6.0.0)
-    bullet_train-themes-tailwind_css (1.6.34)
+    bullet_train-themes-tailwind_css (1.6.35)
       bullet_train-themes
       rails (>= 6.0.0)
     cable_ready (5.0.3)
@@ -364,7 +364,7 @@ GEM
     jsbundling-rails (1.2.1)
       railties (>= 6.0.0)
     json (2.6.3)
-    jwt (2.8.0)
+    jwt (2.8.1)
       base64
     knapsack_pro (5.7.0)
       rake
@@ -654,7 +654,7 @@ GEM
     stimulus-rails (1.3.0)
       railties (>= 6.0.0)
     stringio (3.0.8)
-    stripe (10.10.0)
+    stripe (10.11.0)
     terser (1.1.20)
       execjs (>= 0.3.0, < 3)
     thor (1.3.0)
@@ -712,24 +712,24 @@ DEPENDENCIES
   avo (>= 3.1.7)
   aws-sdk-s3
   bootsnap
-  bullet_train (= 1.6.34)
-  bullet_train-api (= 1.6.34)
-  bullet_train-fields (= 1.6.34)
-  bullet_train-has_uuid (= 1.6.34)
-  bullet_train-incoming_webhooks (= 1.6.34)
-  bullet_train-integrations (= 1.6.34)
-  bullet_train-integrations-stripe (= 1.6.34)
-  bullet_train-obfuscates_id (= 1.6.34)
-  bullet_train-outgoing_webhooks (= 1.6.34)
-  bullet_train-roles (= 1.6.34)
-  bullet_train-scope_questions (= 1.6.34)
-  bullet_train-scope_validator (= 1.6.34)
-  bullet_train-sortable (= 1.6.34)
-  bullet_train-super_load_and_authorize_resource (= 1.6.34)
-  bullet_train-super_scaffolding (= 1.6.34)
-  bullet_train-themes (= 1.6.34)
-  bullet_train-themes-light (= 1.6.34)
-  bullet_train-themes-tailwind_css (= 1.6.34)
+  bullet_train (= 1.6.35)
+  bullet_train-api (= 1.6.35)
+  bullet_train-fields (= 1.6.35)
+  bullet_train-has_uuid (= 1.6.35)
+  bullet_train-incoming_webhooks (= 1.6.35)
+  bullet_train-integrations (= 1.6.35)
+  bullet_train-integrations-stripe (= 1.6.35)
+  bullet_train-obfuscates_id (= 1.6.35)
+  bullet_train-outgoing_webhooks (= 1.6.35)
+  bullet_train-roles (= 1.6.35)
+  bullet_train-scope_questions (= 1.6.35)
+  bullet_train-scope_validator (= 1.6.35)
+  bullet_train-sortable (= 1.6.35)
+  bullet_train-super_load_and_authorize_resource (= 1.6.35)
+  bullet_train-super_scaffolding (= 1.6.35)
+  bullet_train-themes (= 1.6.35)
+  bullet_train-themes-light (= 1.6.35)
+  bullet_train-themes-tailwind_css (= 1.6.35)
   capybara (~> 3.39)
   capybara-email
   capybara-lockstep

config/environments/development.rb

@@ -94,6 +94,7 @@
 
   # whitelist ngrok domains.
   config.hosts << /[a-z0-9-]+\.ngrok\.io/
+  config.hosts << /[a-z0-9-]+\.ngrok-free\.app/
 
   config.action_mailer.delivery_method = :letter_opener
   config.active_job.queue_adapter = :sidekiq

config/initializers/bullet_train.rb

@@ -1,6 +1,8 @@
 BulletTrain.configure do |config|
-  # Uncomment this line if you want to bypass strong passwords.
-  # config.strong_passwords = false
+  # Use strong passwords when registering a user in non-development environment.
+  # Please note that the password validations for devise are still in place
+  # in all environments.
+  config.strong_passwords = !Rails.env.development?
 
   # Enable bulk invitations on the user onboarding step.
   # config.enable_bulk_invitations = true

package.json

@@ -2,9 +2,9 @@
   "name": "app",
   "private": true,
   "dependencies": {
-    "@bullet-train/bullet-train": "1.6.34",
-    "@bullet-train/bullet-train-sortable": "1.6.34",
-    "@bullet-train/fields": "1.6.34",
+    "@bullet-train/bullet-train": "1.6.35",
+    "@bullet-train/bullet-train-sortable": "1.6.35",
+    "@bullet-train/fields": "1.6.35",
     "@esbuild-plugins/node-globals-polyfill": "^0.2.3",
     "@fullhuman/postcss-purgecss": "5.0.0",
     "@hotwired/turbo-rails": "^8.0.3",

test/application_system_test_case.rb

@@ -231,8 +231,17 @@ def sign_in_from_homepage(display_details = self.display_details)
 
   def new_registration_page(display_details = self.display_details)
     # TODO: Adjust tests to start from the home page.
+    # Ensure no one is signed in before trying to register a new account.
+    logout
+
     visit new_user_registration_path
 
+    if invitation_only?
+      assert_text("You need to sign in or sign up before continuing.")
+      refute_text("Create Your Account")
+      visit invitation_path(key: ENV["INVITATION_KEYS"].split(",\s+").first)
+    end
+
     # this forces capybara to wait until the proper page loads.
     # otherwise our tests will immediately start trying to match things before the page even loads.
     assert_text("Create Your Account")

test/system/reactivity_system_test.rb

@@ -36,9 +36,13 @@ def teardown
       end
     end
 
-    # We should be on the account dashboard with no Creative Concepts listed.
+    # Ensure the user was able to sign up successfully.
     assert_text "My Super Team’s Dashboard"
+    @team = Team.find_by(name: "My Super Team")
+
+    visit account_team_scaffolding_absolutely_abstract_creative_concepts_path(@team)
     assert_text "If you're wondering what this"
+    assert_text "Add New Creative Concept"
 
     # Open a new window. We'll bounce back and forth between these two to ensure updates are happening in both places.
     current_url = page.current_url
@@ -47,7 +51,7 @@ def teardown
     # We're going to do some activity and assertions within the new window.
     within_window second_window do
       visit current_url
-      assert_text "My Super Team’s Dashboard"
+      assert_text "My Super Team’s Creative Concepts"
 
       # Ensure we're on a page with no Creative Concepts listed.
       # (This sets us up to confirm that an entire table manifests out of nowhere.)
@@ -65,7 +69,7 @@ def teardown
 
     within_window second_window do
       # Ensure we're still on the same page.
-      assert_text "My Super Team’s Dashboard"
+      assert_text "My Super Team’s Creative Concepts"
 
       # But now the new Creative Concept should be present on the page.
       assert_text "My Generic Creative Concept"

test/system/super_scaffolding/super_scaffolding_test.rb

@@ -286,8 +286,8 @@ def setup
   end
 
   test "OpenAPI V3 document is still valid" do
-    visit "http://127.0.0.1:3001/api/v1/openapi.yaml"
-    puts(output = `yarn exec redocly lint http://127.0.0.1:3001/api/v1/openapi.yaml 1> /dev/stdout 2> /dev/stdout; rm openapi.yaml`)
+    visit "/" # Make sure the test server is running before linting the file.
+    puts(output = `yarn exec redocly lint http://127.0.0.1:3001/api/v1/openapi.yaml 1> /dev/stdout 2> /dev/stdout`)
     # redocly/openapi-core changed the format of their success message in version 1.2.0.
     # https://github.com/Redocly/redocly-cli/pull/1239
     # We use a robust regex here so that we can match both formats.