- | <%= link_to user.email, user_path(user) %> |
+ <%= link_to user, user_path(user) %> |
<% if user == current_user %>
<%= user.status %>
diff --git a/app/views/users/mailer/password_change.html.erb b/app/views/users/mailer/password_change.html.erb
index b41daf4..e750ca7 100644
--- a/app/views/users/mailer/password_change.html.erb
+++ b/app/views/users/mailer/password_change.html.erb
@@ -1,3 +1,3 @@
- Hello <%= @resource.email %>!
+Hello <%= @resource %>!
We're contacting you to notify you that your password has been changed.
diff --git a/app/views/users/mailer/reset_password_instructions.html.erb b/app/views/users/mailer/reset_password_instructions.html.erb
index f667dc1..f1a48b5 100644
--- a/app/views/users/mailer/reset_password_instructions.html.erb
+++ b/app/views/users/mailer/reset_password_instructions.html.erb
@@ -1,4 +1,4 @@
-Hello <%= @resource.email %>!
+Hello <%= @resource %>!
Someone has requested a link to change your password. You can do this through the link below.
diff --git a/app/views/users/mailer/unlock_instructions.html.erb b/app/views/users/mailer/unlock_instructions.html.erb
index 41e148b..0bf243d 100644
--- a/app/views/users/mailer/unlock_instructions.html.erb
+++ b/app/views/users/mailer/unlock_instructions.html.erb
@@ -1,4 +1,4 @@
-Hello <%= @resource.email %>!
+Hello <%= @resource %>!
Your account has been locked due to an excessive number of unsuccessful sign in attempts.
diff --git a/app/views/users/registrations/edit.html.erb b/app/views/users/registrations/edit.html.erb
index 0a6aeef..28c323e 100644
--- a/app/views/users/registrations/edit.html.erb
+++ b/app/views/users/registrations/edit.html.erb
@@ -1,6 +1,6 @@
<% content_for :navigation, flush: true do %>
- <%= image_link_to t(:back), 'arrow-left-bold-outline',
- request.referer.present? ? :back : root_path %>
+ <%= link_to svg_tag("pictograms/arrow-left-bold-outline") + t(:back),
+ request.referer.present? ? :back : root_path, class: 'tab' %>
<% end %>
diff --git a/config/application.rb.dist b/config/application.rb.dist
index adce1d6..d28d914 100644
--- a/config/application.rb.dist
+++ b/config/application.rb.dist
@@ -23,6 +23,10 @@ module FixinMe
# Initialize configuration defaults for originally generated Rails version.
config.load_defaults 7.0
+ # Autoload lib/, required e.g. for core library extensions.
+ # https://guides.rubyonrails.org/autoloading_and_reloading_constants.html#config-autoload-lib-ignore.
+ config.autoload_lib(ignore: %w(assets tasks))
+
# Configuration for the application, engines, and railties goes here.
#
# These settings can be overridden in specific environments using the files
@@ -32,7 +36,7 @@ module FixinMe
# config.eager_load_paths << Rails.root.join("extras")
config.action_dispatch.rescue_responses['ApplicationController::AccessForbidden'] = :forbidden
- config.action_dispatch.rescue_responses['ArgumentError'] = :bad_request
+ config.action_dispatch.rescue_responses['ApplicationController::ParameterInvalid'] = :unprocessable_entity
# SETUP: Below settings need to be updated on a per-installation basis.
#
@@ -47,5 +51,8 @@ module FixinMe
# Email address of admin account
config.admin = 'admin@localhost'
+
+ # Sender address of account registration-related messages
+ Devise.mailer_sender = 'noreply@localhost'
end
end
diff --git a/config/initializers/core_ext.rb b/config/initializers/core_ext.rb
new file mode 100644
index 0000000..fe6bd62
--- /dev/null
+++ b/config/initializers/core_ext.rb
@@ -0,0 +1,9 @@
+require 'core_ext/big_decimal_scientific_notation'
+
+ActiveSupport.on_load :active_record do
+ ActiveModel::Validations::NumericalityValidator.prepend CoreExt::ActiveModel::Validations::NumericalityValidatesPrecisionAndScale
+end
+
+ActiveSupport.on_load :action_dispatch_system_test_case do
+ prepend CoreExt::ActionDispatch::SystemTesting::TestHelpers::ScreenshotHelperUniqueId
+end
diff --git a/config/initializers/devise.rb b/config/initializers/devise.rb
index c7f707c..5012fdc 100644
--- a/config/initializers/devise.rb
+++ b/config/initializers/devise.rb
@@ -24,7 +24,8 @@ Devise.setup do |config|
# Configure the e-mail address which will be shown in Devise::Mailer,
# note that it will be overwritten if you use your own mailer class
# with default "from" parameter.
- config.mailer_sender = 'fixinme@noreply.me'
+ # This is set in 'config/application.rb'.
+ #config.mailer_sender = 'fixinme@noreply.me'
# Configure the class responsible to send e-mails.
# config.mailer = 'Devise::Mailer'
diff --git a/config/initializers/system_test_case.rb b/config/initializers/system_test_case.rb
deleted file mode 100644
index 9e3ef71..0000000
--- a/config/initializers/system_test_case.rb
+++ /dev/null
@@ -1,3 +0,0 @@
-ActiveSupport.on_load :action_dispatch_system_test_case do
- prepend CoreExt::ActionDispatch::SystemTesting::TestHelpers::CustomScreenshotHelperUniqueId
-end
diff --git a/config/locales/en.yml b/config/locales/en.yml
index 06f86ef..1fa61c1 100644
--- a/config/locales/en.yml
+++ b/config/locales/en.yml
@@ -1,4 +1,8 @@
en:
+ errors:
+ messages:
+ precision_exceeded: must not exceed %{value} significant digits
+ scale_exceeded: must not exceed %{value} decimal digits
activerecord:
attributes:
unit:
@@ -33,6 +37,9 @@ en:
forbidden: >
You have not been granted access to this action (403 Forbidden).
This should not happen, please notify site administrator.
+ not_found: >
+ The record that you requested operation on does not exist (404 Not Found).
+ This should not happen, please notify site administrator.
unprocessable_entity: >
The request is semantically incorrect and was rejected (422 Unprocessable Entity).
This should not happen, please notify site administrator.
@@ -54,22 +61,39 @@ en:
delete_unit: Delete
index:
add_unit: Add unit
- import_units: Import...
- no_items: There are no configured units. You can try to import some defaults.
+ import_units: Import
+ no_items: There are no configured units. You can Add some or Import from defaults.
top_level_drop: Drop here to reposition into top-level unit
new:
none: none
create:
- success: Created new unit
+ success: Created new unit "%{unit}"
update:
- success: Updated unit
+ success: Updated unit "%{unit}"
rebase:
- multiplier_reset: Multiplier of "%{symbol}" has been reset to 1, due to repositioning
+ multiplier_reset: Multiplier of "%{unit}" has been reset to 1, due to repositioning
destroy:
- success: Deleted unit
+ success: Deleted unit "%{unit}"
+ default:
+ units:
+ unit:
+ delete: Delete
+ export: Export
+ import: Import
+ index:
+ actions: Actions on defaults
+ back: Back to units
+ import_all: Import all
+ no_items: There are no differences between default and user units.
+ import:
+ success: Imported unit "%{unit}"
+ export:
+ success: Exported unit "%{unit}"
+ destroy:
+ success: Deleted unit "%{unit}"
users:
index:
- disguise: View as...
+ disguise: View as
passwords:
edit:
new_password: New password
diff --git a/config/routes.rb b/config/routes.rb
index 3f556c2..b62b98d 100644
--- a/config/routes.rb
+++ b/config/routes.rb
@@ -3,22 +3,19 @@ Rails.application.routes.draw do
controllers: {registrations: :registrations}
resources :units, except: [:show], path_names: {new: '(/:id)/new'} do
- member do
- post :rebase
- end
+ member { post :rebase }
end
- namespace :units do
- get 'defaults/index'
+ namespace :default do
+ resources :units, only: [:index, :destroy] do
+ member { post :import, :export }
+ #collection { post :import_all }
+ end
end
resources :users, only: [:index, :show, :update] do
- member do
- get :disguise
- end
- collection do
- get :revert
- end
+ member { get :disguise }
+ collection { get :revert }
end
devise_scope :user do
diff --git a/db/migrate/20230602185352_create_units.rb b/db/migrate/20230602185352_create_units.rb
index 9a91f6d..4b5f64c 100644
--- a/db/migrate/20230602185352_create_units.rb
+++ b/db/migrate/20230602185352_create_units.rb
@@ -2,12 +2,12 @@ class CreateUnits < ActiveRecord::Migration[7.0]
def change
create_table :units do |t|
t.references :user, foreign_key: true
- t.string :symbol
- t.string :name
- t.decimal :multiplier, precision: 30, scale: 15, default: 1.0
+ t.string :symbol, null: false, limit: 15
+ t.text :description
+ t.decimal :multiplier, null: false, precision: 30, scale: 15, default: 1.0
t.references :base
- t.timestamps
+ t.timestamps null: false
end
add_index :units, [:user_id, :symbol], unique: true
end
diff --git a/db/schema.rb b/db/schema.rb
index 1dddba7..0006b01 100644
--- a/db/schema.rb
+++ b/db/schema.rb
@@ -10,12 +10,12 @@
#
# It's strongly recommended that you check this file into your version control system.
-ActiveRecord::Schema[7.1].define(version: 2023_06_02_185352) do
+ActiveRecord::Schema[7.2].define(version: 2023_06_02_185352) do
create_table "units", charset: "utf8mb4", collation: "utf8mb4_0900_ai_ci", force: :cascade do |t|
t.bigint "user_id"
- t.string "symbol"
- t.string "name"
- t.decimal "multiplier", precision: 30, scale: 15, default: "1.0"
+ t.string "symbol", limit: 15, null: false
+ t.text "description"
+ t.decimal "multiplier", precision: 30, scale: 15, default: "1.0", null: false
t.bigint "base_id"
t.datetime "created_at", null: false
t.datetime "updated_at", null: false
diff --git a/db/seeds.rb b/db/seeds.rb
index ff9e6e0..335a35f 100644
--- a/db/seeds.rb
+++ b/db/seeds.rb
@@ -20,19 +20,4 @@ end
# Formulas will be deleted as dependent on Quantities
#[Source, Quantity, Unit].each { |model| model.defaults.delete_all }
-Unit.transaction do
- Unit.defaults.delete_all
-
- unit_1 = Unit.create symbol: "1", name: "dimensionless, one"
- Unit.create symbol: "%", base: unit_1, multiplier: 1e-2, name: "percent"
- Unit.create symbol: "‰", base: unit_1, multiplier: 1e-3, name: "promille"
- Unit.create symbol: "‱", base: unit_1, multiplier: 1e-4, name: "basis point"
- Unit.create symbol: "ppm", base: unit_1, multiplier: 1e-6, name: "parts per million"
-
- unit_g = Unit.create symbol: "g", name: "gram"
- Unit.create symbol: "ug", base: unit_g, multiplier: 1e-6, name: "microgram"
- Unit.create symbol: "mg", base: unit_g, multiplier: 1e-3, name: "milligram"
- Unit.create symbol: "kg", base: unit_g, multiplier: 1e3, name: "kilogram"
-
- Unit.create symbol: "kcal", name: "kilocalorie"
-end
+require 'seeds/units.rb'
diff --git a/db/seeds/templates/units.erb b/db/seeds/templates/units.erb
new file mode 100644
index 0000000..c2d4f88
--- /dev/null
+++ b/db/seeds/templates/units.erb
@@ -0,0 +1,9 @@
+Unit.transaction do
+ Unit.defaults.delete_all
+<% Unit.defaults.ordered.each do |unit| %>
+<%= "\n" if unit.base.nil? %>
+ unit_<%= unit.symbol %> =
+ Unit.create symbol: "<%= unit.symbol %>",<% unless unit.base.nil? %> base: unit_<%= unit.base.symbol %>, multiplier: <%= unit.multiplier.to_scientific %>,<% end %>
+ description: "<%= unit.description %>"
+<% end %>
+end
diff --git a/db/seeds/units.rb b/db/seeds/units.rb
new file mode 100644
index 0000000..1b79bf9
--- /dev/null
+++ b/db/seeds/units.rb
@@ -0,0 +1,36 @@
+Unit.transaction do
+ Unit.defaults.delete_all
+
+ unit_1 =
+ Unit.create symbol: "1",
+ description: "dimensionless, one"
+ unit_ppm =
+ Unit.create symbol: "ppm", base: unit_1, multiplier: 1e-6,
+ description: "parts per million"
+ unit_‱ =
+ Unit.create symbol: "‱", base: unit_1, multiplier: 1e-4,
+ description: "basis point"
+ unit_‰ =
+ Unit.create symbol: "‰", base: unit_1, multiplier: 1e-3,
+ description: "promille"
+ unit_% =
+ Unit.create symbol: "%", base: unit_1, multiplier: 1e-2,
+ description: "percent"
+
+ unit_g =
+ Unit.create symbol: "g",
+ description: "gram"
+ unit_ug =
+ Unit.create symbol: "ug", base: unit_g, multiplier: 1e-6,
+ description: "microgram"
+ unit_mg =
+ Unit.create symbol: "mg", base: unit_g, multiplier: 1e-3,
+ description: "milligram"
+ unit_kg =
+ Unit.create symbol: "kg", base: unit_g, multiplier: 1e3,
+ description: "kilogram"
+
+ unit_kcal =
+ Unit.create symbol: "kcal",
+ description: "kilocalorie"
+end
diff --git a/lib/core_ext/action_dispatch/system_testing/test_helpers/custom_screenshot_helper_unique_id.rb b/lib/core_ext/action_dispatch/system_testing/test_helpers/screenshot_helper_unique_id.rb
similarity index 52%
rename from lib/core_ext/action_dispatch/system_testing/test_helpers/custom_screenshot_helper_unique_id.rb
rename to lib/core_ext/action_dispatch/system_testing/test_helpers/screenshot_helper_unique_id.rb
index 3798c38..248a6fd 100644
--- a/lib/core_ext/action_dispatch/system_testing/test_helpers/custom_screenshot_helper_unique_id.rb
+++ b/lib/core_ext/action_dispatch/system_testing/test_helpers/screenshot_helper_unique_id.rb
@@ -1,4 +1,4 @@
-module CoreExt::ActionDispatch::SystemTesting::TestHelpers::CustomScreenshotHelperUniqueId
+module CoreExt::ActionDispatch::SystemTesting::TestHelpers::ScreenshotHelperUniqueId
private
def unique
diff --git a/lib/core_ext/active_model/validations/numericality_validates_precision_and_scale.rb b/lib/core_ext/active_model/validations/numericality_validates_precision_and_scale.rb
new file mode 100644
index 0000000..a8fe744
--- /dev/null
+++ b/lib/core_ext/active_model/validations/numericality_validates_precision_and_scale.rb
@@ -0,0 +1,16 @@
+module CoreExt::ActiveModel::Validations::NumericalityValidatesPrecisionAndScale
+ def validate_each(record, attr_name, value, ...)
+ super(record, attr_name, value, ...)
+
+ if options[:precision] || options[:scale]
+ attr_type = record.class.type_for_attribute(attr_name)
+ value = BigDecimal(value) unless value.is_a? BigDecimal
+ if options[:precision] && (value.precision > attr_type.precision)
+ record.errors.add(attr_name, :precision_exceeded, **filtered_options(attr_type.precision))
+ end
+ if options[:scale] && (value.scale > attr_type.scale)
+ record.errors.add(attr_name, :scale_exceeded, **filtered_options(attr_type.scale))
+ end
+ end
+ end
+end
diff --git a/lib/core_ext/big_decimal_scientific_notation.rb b/lib/core_ext/big_decimal_scientific_notation.rb
new file mode 100644
index 0000000..0a45c90
--- /dev/null
+++ b/lib/core_ext/big_decimal_scientific_notation.rb
@@ -0,0 +1,36 @@
+module CoreExt
+ module BigDecimalScientificNotation
+ def to_scientific
+ return 'NaN' unless finite?
+
+ sign, coefficient, base, exponent = split
+ (sign == -1 ? '-' : '') +
+ (coefficient.length > 1 ? coefficient.insert(1, '.') : coefficient) +
+ (exponent != 1 ? "e#{exponent-1}" : '')
+ end
+
+ # Converts value to HTML formatted scientific notation
+ def to_html
+ sign, coefficient, base, exponent = split
+ return 'NaN' unless sign
+
+ result = (sign == -1 ? '-' : '')
+ unless coefficient == '1' && sign == 1
+ if coefficient.length > 1
+ result += coefficient.insert(1, '.')
+ elsif
+ result += coefficient
+ end
+ if exponent != 1
+ result += "×"
+ end
+ end
+ if exponent != 1
+ result += "10 % d" % [exponent-1]
+ end
+ result.html_safe
+ end
+ end
+end
+
+BigDecimal.prepend CoreExt::BigDecimalScientificNotation
diff --git a/lib/tasks/db.rake b/lib/tasks/db.rake
new file mode 100644
index 0000000..f2e5233
--- /dev/null
+++ b/lib/tasks/db.rake
@@ -0,0 +1,12 @@
+namespace :db do
+ namespace :seed do
+ desc "Dump default settings as seed data to db/seeds/*.rb"
+ task export: :environment do
+ seeds_path = Pathname.new(Rails.application.paths["db"].first) / 'seeds'
+ (seeds_path / 'templates').glob('*.erb').each do |template_path|
+ template = ERB.new(template_path.read, trim_mode: '<>')
+ (seeds_path / "#{template_path.basename('.*').to_s}.rb").write(template.result)
+ end
+ end
+ end
+end
diff --git a/test/application_system_test_case.rb b/test/application_system_test_case.rb
index fab452d..2f70892 100644
--- a/test/application_system_test_case.rb
+++ b/test/application_system_test_case.rb
@@ -1,10 +1,13 @@
require "test_helper"
class ApplicationSystemTestCase < ActionDispatch::SystemTestCase
+ extend ActionView::Helpers::TranslationHelper
include ActionView::Helpers::UrlHelper
# NOTE: geckodriver installed with Firefox, ignore incompatibility warning
- Selenium::WebDriver.logger.ignore(:selenium_manager)
+ Selenium::WebDriver.logger
+ .ignore(:selenium_manager, :clear_session_storage, :clear_local_storage)
+
Capybara.configure do |config|
config.save_path = "#{Rails.root}/tmp/screenshots/"
end
@@ -30,4 +33,18 @@ class ApplicationSystemTestCase < ActionDispatch::SystemTestCase
#def assert_stale(element)
# assert_raises(Selenium::WebDriver::Error::StaleElementReferenceError) { element.tag_name }
#end
+
+ # HTML does not allow [disabled] attribute on tag, so it's not possible to
+ # easily find them using e.g. :link selector
+ #Capybara.add_selector(:disabled_link) do
+ # label " tag with [disabled] attribute"
+ #end
+
+ test "click disabled link" do
+ # Link should be unclickable
+ # assert_raises(Selenium::WebDriver::Error::ElementClickInterceptedError) do
+ # # Use custom selector for disabled links
+ # find('a[disabled]').click
+ # end
+ end
end
diff --git a/test/controllers/units/defaults_controller_test.rb b/test/controllers/default/units_controller_test.rb
similarity index 63%
rename from test/controllers/units/defaults_controller_test.rb
rename to test/controllers/default/units_controller_test.rb
index b01dfe2..2742778 100644
--- a/test/controllers/units/defaults_controller_test.rb
+++ b/test/controllers/default/units_controller_test.rb
@@ -1,6 +1,6 @@
require "test_helper"
-class Units::DefaultsControllerTest < ActionDispatch::IntegrationTest
+class Default::UnitsControllerTest < ActionDispatch::IntegrationTest
test "should get index" do
get units_defaults_index_url
assert_response :success
diff --git a/test/fixtures/units.yml b/test/fixtures/units.yml
index d580608..6e6ca5b 100644
--- a/test/fixtures/units.yml
+++ b/test/fixtures/units.yml
@@ -1,40 +1,40 @@
g:
user: admin
symbol: g
- name: gram
+ description: gram
kg:
user: admin
symbol: kg
- name: kilogram
+ description: kilogram
multiplier: 1000
base: g
1:
user: admin
symbol: 1
- name: one
+ description: one
s:
user: admin
symbol: s
- name: second
+ description: second
percent:
user: admin
symbol: '%'
- name: percent
+ description: percent
multiplier: 0.01
base: 1
µg:
user: admin
symbol: µg
- name: microgram
+ description: microgram
multiplier: 0.000001
base: g
mg:
user: admin
symbol: mg
- name: milligram
+ description: milligram
multiplier: 0.001
base: g
g_alice:
user: alice
symbol: g
- name: gram
+ description: gram
diff --git a/test/system/units_test.rb b/test/system/units_test.rb
index c96127e..cbdd625 100644
--- a/test/system/units_test.rb
+++ b/test/system/units_test.rb
@@ -1,8 +1,16 @@
require "application_system_test_case"
class UnitsTest < ApplicationSystemTestCase
+ LINK_LABELS = {
+ add_unit: t('units.index.add_unit'),
+ add_subunit: t('units.unit.add_subunit'),
+ edit: nil
+ }
+
setup do
@user = sign_in
+ LINK_LABELS[:edit] = Regexp.union(@user.units.map(&:symbol))
+
visit units_path
end
@@ -12,7 +20,8 @@ class UnitsTest < ApplicationSystemTestCase
assert_selector 'tr', count: @user.units.count
end
- Unit.destroy_all
+ # Cannot #destroy_all due to {dependent: :restrict*} on Unit.subunits association
+ @user.units.delete_all
visit units_path
within 'tbody' do
assert_selector 'tr', count: 1
@@ -20,16 +29,24 @@ class UnitsTest < ApplicationSystemTestCase
end
end
- test "add unit" do
- click_on t('units.index.add_unit')
+ test "new" do
+ type, label = LINK_LABELS.assoc([:add_unit, :add_subunit].sample)
+ add_link = all(:link, exact_text: label).sample
+ add_link.click
+ assert_equal 'disabled', add_link[:disabled]
within 'tbody > tr:has(input[type=text], textarea)' do
assert_selector ':focus'
- maxlength = all(:fillable_field).to_h { |f| [f[:name], f[:maxlength].to_i || 1000] }
+
+ maxlength = all(:fillable_field).to_h { |f| [f[:name], f[:maxlength].to_i || 2**16] }
+
fill_in 'unit[symbol]',
- with: SecureRandom.random_symbol(rand([1..15, 15..maxlength['unit[symbol]']].sample))
- fill_in 'unit[name]',
- with: [nil, SecureRandom.alphanumeric(rand(1..maxlength['unit[name]']))].sample
+ with: random_string(rand([1..3, 4..maxlength['unit[symbol]']].sample))
+ fill_in 'unit[description]', with: random_string(rand(0..maxlength['unit[description]']))
+ within :field, 'unit[multiplier]' do |field|
+ fill_in with: random_number(field[:max], field[:step])
+ end if add_link[:text] != t('units.index.add_unit')
+
assert_difference ->{ Unit.count }, 1 do
click_on t('helpers.submit.create')
end
@@ -39,39 +56,48 @@ class UnitsTest < ApplicationSystemTestCase
assert_no_selector :fillable_field
assert_selector 'tr', count: @user.units.count
end
- assert_selector '.flash.notice', text: /^#{t('units.create.success')}/
+ assert_no_selector :element, :a, 'disabled': 'disabled',
+ exact_text: Regexp.union(LINK_LABELS.fetch_values(:add_unit, :add_subunit))
+ assert_selector '.flash.notice', text: t('units.create.success', unit: Unit.all.last.symbol)
end
- test "add and edit disallow opening multiple forms" do
- # Once new/edit form is open, other actions on the same page either replace
- # the form or leave it untouched
- # TODO: add non-empty form closing warning
+ # TODO: check proper form/button redisplay and flash messages on add/edit
+ test "new and edit form on validation error" do
+ end
+
+ # TODO: add non-empty form closing warning
+ test "new and edit disallow opening multiple forms" do
+ # Once new/edit form is open, attempt to open another one will close it
links = {}
- link_labels = {1 => [t('units.index.add_unit'), t('units.unit.add_subunit')],
- 0 => units.map(&:symbol)}
- link_labels.each_pair do |row_change, labels|
- all(:link_or_button, exact_text: Regexp.union(labels)).map { |l| links[l] = row_change }
+ targets = {}
+ LINK_LABELS.each_pair do |type, labels|
+ links[type] = all(:link_or_button, exact_text: labels).to_a
+ targets[type] = links[type].sample
end
- link, rows = links.assoc(links.keys.sample).tap { |l, _| links.delete(l) }
+ # Define tr count change depending on link clicked
+ row_change = {add_unit: 1, add_subunit: 1, edit: 0}
+
+ type, link = targets.assoc(targets.keys.sample).tap { |t, _| targets.delete(t) }
+ rows = row_change[type]
assert_difference ->{ all('tbody tr').count }, rows do
link.click
end
- find 'tbody tr:has(input[type=text]:focus)'
-
- # Link should be now unavailable or unclickable
- begin
- assert_raises(Selenium::WebDriver::Error::ElementClickInterceptedError) do
- link.click
- end if link.visible?
- rescue Selenium::WebDriver::Error::StaleElementReferenceError
- link = nil
+ within('tbody tr:has(input[type=text])') { assert_selector ':focus' }
+ if type == :edit
+ assert !link.visible?
+ [:add_subunit, :edit].each do |t|
+ assert_difference(->{ links[t].length }, -1) { links[t].select!(&:visible?) }
+ end
+ else
+ assert link[:disabled]
end
- link = links.keys.select(&:visible?).sample
- assert_difference ->{ all('tbody tr').count }, links[link] - rows do
+ targets.merge([:add_subunit, :edit].map { |t| [t, links[t].sample] }.to_h)
+ type, link = targets.assoc(targets.keys.sample)
+ assert_difference ->{ all('tbody tr').count }, row_change[type] - rows do
link.click
end
- assert_selector 'tbody tr:has(input[type=text]:focus)', count: 1
+ within('tbody tr:has(input[type=text])') { assert_selector ':focus' }
end
# NOTE: extend with any add/edit link
diff --git a/test/test_helper.rb b/test/test_helper.rb
index 1e7f8dc..183e6e8 100644
--- a/test/test_helper.rb
+++ b/test/test_helper.rb
@@ -9,15 +9,41 @@ class ActiveSupport::TestCase
# Setup all fixtures in test/fixtures/*.yml for all tests in alphabetical order.
fixtures :all
- include AbstractController::Translation
include ActionMailer::TestHelper
+ include ActionView::Helpers::TranslationHelper
- # NOTE: use public #alphanumeric(chars: ...) from Ruby 3.3 onwards
- SecureRandom.class_eval do
- def self.random_symbol(n = 10)
- # Unicode characters: 32-126, 160-383
- choose([*' '..'~', 160.chr(Encoding::UTF_8), *'¡'..'ſ'], n)
+ # List of categorized Unicode characters:
+ # * http://www.unicode.org/Public/UNIDATA/UnicodeData.txt
+ # File format: http://www.unicode.org/L2/L1999/UnicodeData.html
+ # Select from graphic ranges: L, M, N, P, S, Zs
+ UNICODE_CHARS = {
+ 1 => [*"\u0020".."\u007E"],
+ 2 => [*"\u00A0".."\u00AC",
+ *"\u00AE".."\u05FF",
+ *"\u0606".."\u061B",
+ *"\u061D".."\u06DC",
+ *"\u06DE".."\u070E",
+ *"\u0710".."\u07FF"]
+ }
+ UNICODE_CHARS.default = UNICODE_CHARS[1] + UNICODE_CHARS[2]
+ def random_string(bytes = 10)
+ result = ''
+ while bytes > 0
+ result += UNICODE_CHARS[bytes].sample.tap { |c| bytes -= c.bytesize }
end
+ result
+ end
+
+ # Assumes: max >= step and step = 1e[-]N, both as strings
+ def random_number(max, step)
+ max.delete!('.')
+ precision = max.length
+ start = rand(precision) + 1
+ d = (rand(max.to_i) + 1) % 10**start
+ length = rand([0, 1..4, 4..precision].sample)
+ d = d.truncate(-start + length)
+ d = 10**(start - length) if d.zero?
+ BigDecimal(step) * d
end
def randomize_user_password!(user)
@@ -25,11 +51,11 @@ class ActiveSupport::TestCase
end
def random_password
- SecureRandom.alphanumeric rand(Rails.configuration.devise.password_length)
+ Random.alphanumeric rand(Rails.configuration.devise.password_length)
end
def random_email
- "%s@%s.%s" % (1..3).map { SecureRandom.alphanumeric(rand(1..20)) }
+ "%s@%s.%s" % (1..3).map { Random.alphanumeric(rand(1..20)) }
end
def with_last_email
|