The personal finance app for everyone
Move merchants to top-level namespace (#895)
Zach Gollwitzerdc3147c10115
diff --git a/app/controllers/merchants_controller.rb b/app/controllers/merchants_controller.rbnew file mode 100644index 00000000..17c1343f--- /dev/null+++ b/app/controllers/merchants_controller.rb@@ -0,0 +1,41 @@+class MerchantsController < ApplicationController+ layout "with_sidebar"++ before_action :set_merchant, only: %i[ edit update destroy ]++ def index+ @merchants = Current.family.merchants.alphabetically+ end++ def new+ @merchant = Merchant.new+ end++ def create+ Current.family.merchants.create!(merchant_params)+ redirect_to merchants_path, notice: t(".success")+ end++ def edit+ end++ def update+ @merchant.update!(merchant_params)+ redirect_to merchants_path, notice: t(".success")+ end++ def destroy+ @merchant.destroy!+ redirect_to merchants_path, notice: t(".success")+ end++ private++ def set_merchant+ @merchant = Current.family.merchants.find(params[:id])+ end++ def merchant_params+ params.require(:merchant).permit(:name, :color)+ end+enddiff --git a/app/controllers/transactions/merchants_controller.rb b/app/controllers/transactions/merchants_controller.rbdeleted file mode 100644index 470953a5..00000000--- a/app/controllers/transactions/merchants_controller.rb+++ /dev/null@@ -1,41 +0,0 @@-class Transactions::MerchantsController < ApplicationController- layout "with_sidebar"-- before_action :set_merchant, only: %i[ edit update destroy ]-- def index- @merchants = Current.family.transaction_merchants.alphabetically- end-- def new- @merchant = Transaction::Merchant.new- end-- def create- Current.family.transaction_merchants.create!(merchant_params)- redirect_to transaction_merchants_path, notice: t(".success")- end-- def edit- end-- def update- @merchant.update!(merchant_params)- redirect_to transaction_merchants_path, notice: t(".success")- end-- def destroy- @merchant.destroy!- redirect_to transaction_merchants_path, notice: t(".success")- end-- private-- def set_merchant- @merchant = Current.family.transaction_merchants.find(params[:id])- end-- def merchant_params- params.require(:transaction_merchant).permit(:name, :color)- end-enddiff --git a/app/models/family.rb b/app/models/family.rbindex a86980ff..1159fd87 100644--- a/app/models/family.rb+++ b/app/models/family.rb@@ -6,7 +6,7 @@ class Family < ApplicationRecordhas_many :transactions, through: :accountshas_many :imports, through: :accountshas_many :categories, dependent: :destroy- has_many :transaction_merchants, dependent: :destroy, class_name: "Transaction::Merchant"+ has_many :merchants, dependent: :destroydef snapshot(period = Period.all)query = accounts.active.joins(:balances)diff --git a/app/models/transaction/merchant.rb b/app/models/merchant.rbsimilarity index 84%rename from app/models/transaction/merchant.rbrename to app/models/merchant.rbindex 369ab916..5e657763 100644--- a/app/models/transaction/merchant.rb+++ b/app/models/merchant.rb@@ -1,4 +1,4 @@-class Transaction::Merchant < ApplicationRecord+class Merchant < ApplicationRecordhas_many :transactions, dependent: :nullifybelongs_to :familydiff --git a/app/models/transaction.rb b/app/models/transaction.rbindex 7f534839..1657873a 100644--- a/app/models/transaction.rb+++ b/app/models/transaction.rb@@ -21,7 +21,7 @@ class Transaction < ApplicationRecordscope :with_categories, ->(categories) { joins(:category).where(categories: { name: categories }) }scope :with_accounts, ->(accounts) { joins(:account).where(accounts: { name: accounts }) }scope :with_account_ids, ->(account_ids) { joins(:account).where(accounts: { id: account_ids }) }- scope :with_merchants, ->(merchants) { joins(:merchant).where(transaction_merchants: { name: merchants }) }+ scope :with_merchants, ->(merchants) { joins(:merchant).where(merchants: { name: merchants }) }scope :on_or_after_date, ->(date) { where("transactions.date >= ?", date) }scope :on_or_before_date, ->(date) { where("transactions.date <= ?", date) }scope :with_converted_amount, ->(currency = Current.family.currency) {diff --git a/app/views/categories/index.html.erb b/app/views/categories/index.html.erbindex 29a2a12c..0cf2f577 100644--- a/app/views/categories/index.html.erb+++ b/app/views/categories/index.html.erb@@ -23,6 +23,6 @@<footer class="flex justify-between gap-4"><%= previous_setting("Tags", tags_path) %>- <%= next_setting("Merchants", transaction_merchants_path) %>+ <%= next_setting("Merchants", merchants_path) %></footer></section>diff --git a/app/views/transactions/merchants/_avatar.html.erb b/app/views/merchants/_avatar.html.erbsimilarity index 100%rename from app/views/transactions/merchants/_avatar.html.erbrename to app/views/merchants/_avatar.html.erbdiff --git a/app/views/transactions/merchants/_form.html.erb b/app/views/merchants/_form.html.erbsimilarity index 72%rename from app/views/transactions/merchants/_form.html.erbrename to app/views/merchants/_form.html.erbindex 68526568..aebeef4e 100644--- a/app/views/transactions/merchants/_form.html.erb+++ b/app/views/merchants/_form.html.erb@@ -1,14 +1,14 @@<% is_editing = @merchant.id.present? %><div data-controller="merchant-avatar">- <%= form_with model: @merchant, url: is_editing ? transaction_merchant_path(@merchant) : transaction_merchants_path, method: is_editing ? :patch : :post, scope: :transaction_merchant, data: { turbo: false } do |f| %>+ <%= form_with model: @merchant, url: is_editing ? merchant_path(@merchant) : merchants_path, method: is_editing ? :patch : :post, scope: :merchant, data: { turbo: false } do |f| %><section class="space-y-4"><div class="w-fit m-auto">- <%= render partial: "transactions/merchants/avatar", locals: { merchant: } %>+ <%= render partial: "merchants/avatar", locals: { merchant: } %></div>- <div data-controller="select" data-select-active-class="bg-gray-200" data-select-selected-value="<%= @merchant&.color || Transaction::Merchant::COLORS[0] %>">+ <div data-controller="select" data-select-active-class="bg-gray-200" data-select-selected-value="<%= @merchant&.color || Merchant::COLORS[0] %>"><%= f.hidden_field :color, data: { select_target: "input", merchant_avatar_target: "color" } %><ul data-select-target="list" class="flex gap-2 items-center">- <% Transaction::Merchant::COLORS.each do |color| %>+ <% Merchant::COLORS.each do |color| %><li tabindex="0" data-select-target="option" data-action="click->select#selectOption" data-value="<%= color %>" class="flex shrink-0 justify-center items-center w-6 h-6 cursor-pointer hover:bg-gray-200 rounded-full"><div style="background-color: <%= color %>" class="shrink-0 w-4 h-4 rounded-full"></div></li>diff --git a/app/views/transactions/merchants/_list.html.erb b/app/views/merchants/_list.html.erbsimilarity index 89%rename from app/views/transactions/merchants/_list.html.erbrename to app/views/merchants/_list.html.erbindex af4bca7b..35ac3e6d 100644--- a/app/views/transactions/merchants/_list.html.erb+++ b/app/views/merchants/_list.html.erb@@ -2,7 +2,7 @@<% merchants.each.with_index do |merchant, index| %><div class="flex justify-between items-center p-4 bg-white"><div class="flex w-full items-center gap-2.5">- <%= render partial: "transactions/merchants/avatar", locals: { merchant: } %>+ <%= render partial: "merchants/avatar", locals: { merchant: } %><p class="text-gray-900 text-sm truncate"><%= merchant.name %></p>@@ -13,13 +13,13 @@</button><div data-menu-target="content" class="absolute z-10 top-10 right-0 border border-alpha-black-25 bg-white rounded-lg shadow-xs w-48 hidden"><div class="border-t border-b border-alpha-black-100 p-1">- <%= button_to edit_transaction_merchant_path(merchant),+ <%= button_to edit_merchant_path(merchant),method: :get,class: "flex w-full gap-1 items-center text-sm hover:bg-gray-50 rounded-lg px-3 py-2",data: { turbo_frame: "modal" } do %><%= lucide_icon("pencil-line", class: "w-5 h-5 mr-2") %> <%= t(".edit") %><% end %>- <%= button_to transaction_merchant_path(merchant),+ <%= button_to merchant_path(merchant),method: :delete,class: "flex w-full gap-1 items-center text-sm text-red-600 hover:text-red-800 hover:bg-gray-50 rounded-lg px-3 py-2",data: {diff --git a/app/views/transactions/merchants/edit.html.erb b/app/views/merchants/edit.html.erbsimilarity index 100%rename from app/views/transactions/merchants/edit.html.erbrename to app/views/merchants/edit.html.erbdiff --git a/app/views/transactions/merchants/index.html.erb b/app/views/merchants/index.html.erbsimilarity index 80%rename from app/views/transactions/merchants/index.html.erbrename to app/views/merchants/index.html.erbindex 1dd8162d..c9a725b7 100644--- a/app/views/transactions/merchants/index.html.erb+++ b/app/views/merchants/index.html.erb@@ -4,7 +4,7 @@<div class="space-y-4"><div class="flex items-center justify-between"><h1 class="text-xl font-medium text-gray-900"><%= t(".title") %></h1>- <%= link_to new_transaction_merchant_path, class: "flex text-white text-sm font-medium items-center gap-1 bg-gray-900 rounded-lg p-2 pr-3", data: { turbo_frame: "modal" } do %>+ <%= link_to new_merchant_path, class: "flex text-white text-sm font-medium items-center gap-1 bg-gray-900 rounded-lg p-2 pr-3", data: { turbo_frame: "modal" } do %><%= lucide_icon("plus", class: "w-5 h-5") %><span><%= t(".new_short") %></span><% end %>@@ -14,7 +14,7 @@<div class="flex justify-center items-center py-20"><div class="text-center flex flex-col items-center max-w-[300px]"><p class="text-gray-900 mb-1 font-medium text-sm"><%= t(".empty") %></p>- <%= link_to new_transaction_merchant_path, class: "w-fit flex text-white text-sm font-medium items-center gap-1 bg-gray-900 rounded-lg p-2 pr-3", data: { turbo_frame: "modal" } do %>+ <%= link_to new_merchant_path, class: "w-fit flex text-white text-sm font-medium items-center gap-1 bg-gray-900 rounded-lg p-2 pr-3", data: { turbo_frame: "modal" } do %><%= lucide_icon("plus", class: "w-5 h-5") %><span><%= t(".new_long") %></span><% end %>@@ -27,7 +27,7 @@<span class="text-gray-400 mx-2">·</span><p><%= @merchants.count %></p></div>- <%= render partial: "transactions/merchants/list", locals: { merchants: @merchants } %>+ <%= render partial: "merchants/list", locals: { merchants: @merchants } %></div><% end %></div>diff --git a/app/views/transactions/merchants/new.html.erb b/app/views/merchants/new.html.erbsimilarity index 100%rename from app/views/transactions/merchants/new.html.erbrename to app/views/merchants/new.html.erbdiff --git a/app/views/settings/_nav.html.erb b/app/views/settings/_nav.html.erbindex 355ff63c..cf0a8209 100644--- a/app/views/settings/_nav.html.erb+++ b/app/views/settings/_nav.html.erb@@ -53,7 +53,7 @@<%= sidebar_link_to t(".categories_label"), categories_path, icon: "tags" %></li><li>- <%= sidebar_link_to t(".merchants_label"), transaction_merchants_path, icon: "store" %>+ <%= sidebar_link_to t(".merchants_label"), merchants_path, icon: "store" %></li><li><%= sidebar_link_to t(".rules_label"), transaction_rules_path, icon: "list-checks" %>diff --git a/app/views/transactions/bulk_edit.html.erb b/app/views/transactions/bulk_edit.html.erbindex 1c10cd8a..e41ebfed 100644--- a/app/views/transactions/bulk_edit.html.erb+++ b/app/views/transactions/bulk_edit.html.erb@@ -29,7 +29,7 @@<div class="pb-6 space-y-2"><%= form.date_field :date, label: t(".date_label"), max: Date.current %><%= form.collection_select :category_id, Current.family.categories.alphabetically, :id, :name, { prompt: t(".category_placeholder"), label: t(".category_label"), class: "text-gray-400" } %>- <%= form.collection_select :merchant_id, Current.family.transaction_merchants.alphabetically, :id, :name, { prompt: t(".merchant_placeholder"), label: t(".merchant_label"), class: "text-gray-400" } %>+ <%= form.collection_select :merchant_id, Current.family.merchants.alphabetically, :id, :name, { prompt: t(".merchant_placeholder"), label: t(".merchant_label"), class: "text-gray-400" } %></div></details>diff --git a/app/views/transactions/rules/index.html.erb b/app/views/transactions/rules/index.html.erbindex bb0bf5f6..6e3162a7 100644--- a/app/views/transactions/rules/index.html.erb+++ b/app/views/transactions/rules/index.html.erb@@ -9,7 +9,7 @@</div></div><div class="flex justify-between gap-4">- <%= previous_setting("Merchants", transaction_merchants_path) %>+ <%= previous_setting("Merchants", merchants_path) %><%= next_setting("Imports", imports_path) %></div></div>diff --git a/app/views/transactions/searches/filters/_merchant_filter.html.erb b/app/views/transactions/searches/filters/_merchant_filter.html.erbindex 160dd15c..5faca04c 100644--- a/app/views/transactions/searches/filters/_merchant_filter.html.erb+++ b/app/views/transactions/searches/filters/_merchant_filter.html.erb@@ -5,7 +5,7 @@<%= lucide_icon("search", class: "w-5 h-5 text-gray-500 absolute inset-y-0 left-2 top-1/2 transform -translate-y-1/2") %></div><div class="my-2" id="list" data-list-filter-target="list">- <% Current.family.transaction_merchants.alphabetically.each do |merchant| %>+ <% Current.family.merchants.alphabetically.each do |merchant| %><div class="filterable-item flex items-center gap-2 p-2" data-filter-name="<%= merchant.name %>"><%= form.check_box :merchants,{diff --git a/app/views/transactions/show.html.erb b/app/views/transactions/show.html.erbindex fe49b650..e83e4c59 100644--- a/app/views/transactions/show.html.erb+++ b/app/views/transactions/show.html.erb@@ -30,7 +30,7 @@<% unless @transaction.marked_as_transfer %><%= f.collection_select :category_id, Current.family.categories.alphabetically, :id, :name, { prompt: t(".category_placeholder"), label: t(".category_label"), class: "text-gray-400" }, "data-auto-submit-form-target": "auto" %>- <%= f.collection_select :merchant_id, Current.family.transaction_merchants.alphabetically, :id, :name, { prompt: t(".merchant_placeholder"), label: t(".merchant_label"), class: "text-gray-400" }, "data-auto-submit-form-target": "auto" %>+ <%= f.collection_select :merchant_id, Current.family.merchants.alphabetically, :id, :name, { prompt: t(".merchant_placeholder"), label: t(".merchant_label"), class: "text-gray-400" }, "data-auto-submit-form-target": "auto" %><% end %><%= f.collection_select :account_id, Current.family.accounts.alphabetically, :id, :name, { prompt: t(".account_placeholder"), label: t(".account_label"), class: "text-gray-500" }, { class: "form-field__input cursor-not-allowed text-gray-400", disabled: "disabled" } %>diff --git a/config/locales/views/merchants/en.yml b/config/locales/views/merchants/en.ymlnew file mode 100644index 00000000..e3f7247e--- /dev/null+++ b/config/locales/views/merchants/en.yml@@ -0,0 +1,29 @@+---+en:+ merchants:+ create:+ success: New merchant created successfully+ destroy:+ success: Merchant deleted successfully+ edit:+ title: Edit merchant+ form:+ name_placeholder: Merchant name+ submit_create: Add merchant+ submit_edit: Update+ index:+ empty: No merchants yet+ new_long: New merchant+ new_short: New+ title: Merchants+ list:+ confirm_accept: Delete merchant+ confirm_body: Are you sure you want to delete this merchant? Removing this merchant+ will unlink all associated transactions and may effect your reporting.+ confirm_title: Delete merchant?+ delete: Delete merchant+ edit: Edit merchant+ new:+ title: New merchant+ update:+ success: Merchant updated successfullydiff --git a/config/locales/views/transactions/en.yml b/config/locales/views/transactions/en.ymlindex b74298d4..78120fe9 100644--- a/config/locales/views/transactions/en.yml+++ b/config/locales/views/transactions/en.yml@@ -50,33 +50,6 @@ en:transaction: transactionmark_transfers:success: Marked as transfer- merchants:- create:- success: New merchant created successfully- destroy:- success: Merchant deleted successfully- edit:- title: Edit merchant- form:- name_placeholder: Merchant name- submit_create: Add merchant- submit_edit: Update- index:- empty: No merchants yet- new_long: New merchant- new_short: New- title: Merchants- list:- confirm_accept: Delete merchant- confirm_body: Are you sure you want to delete this merchant? Removing this- merchant will unlink all associated transactions and may effect your reporting.- confirm_title: Delete merchant?- delete: Delete merchant- edit: Edit merchant- new:- title: New merchant- update:- success: Merchant updated successfullyselection_bar:mark_transfers: Mark as transfers?mark_transfers_confirm: Mark as transfersdiff --git a/config/routes.rb b/config/routes.rbindex a1f98f7e..a6026f2e 100644--- a/config/routes.rb+++ b/config/routes.rb@@ -48,6 +48,8 @@ Rails.application.routes.draw doendend+ resources :merchants, only: %i[ index new create edit update destroy ]+resources :transactions docollection dopost "bulk_delete"@@ -59,7 +61,6 @@ Rails.application.routes.draw doscope module: :transactions, as: :transaction doresources :rows, only: %i[ show update ]resources :rules, only: %i[ index ]- resources :merchants, only: %i[ index new create edit update destroy ]endendenddiff --git a/db/migrate/20240620122201_rename_merchants_table.rb b/db/migrate/20240620122201_rename_merchants_table.rbnew file mode 100644index 00000000..f5fa770c--- /dev/null+++ b/db/migrate/20240620122201_rename_merchants_table.rb@@ -0,0 +1,5 @@+class RenameMerchantsTable < ActiveRecord::Migration[7.2]+ def change+ rename_table :transaction_merchants, :merchants+ end+enddiff --git a/db/schema.rb b/db/schema.rbindex 1a40956f..b82ad346 100644--- a/db/schema.rb+++ b/db/schema.rb@@ -10,7 +10,7 @@## It's strongly recommended that you check this file into your version control system.-ActiveRecord::Schema[7.2].define(version: 2024_06_20_114307) do+ActiveRecord::Schema[7.2].define(version: 2024_06_20_122201) do# These are extensions that must be enabled in order to support this databaseenable_extension "pgcrypto"enable_extension "plpgsql"@@ -242,6 +242,15 @@ ActiveRecord::Schema[7.2].define(version: 2024_06_20_114307) dot.datetime "updated_at", null: falseend+ create_table "merchants", id: :uuid, default: -> { "gen_random_uuid()" }, force: :cascade do |t|+ t.string "name", null: false+ t.string "color", default: "#e99537", null: false+ t.uuid "family_id", null: false+ t.datetime "created_at", null: false+ t.datetime "updated_at", null: false+ t.index ["family_id"], name: "index_merchants_on_family_id"+ end+create_table "other_assets", id: :uuid, default: -> { "gen_random_uuid()" }, force: :cascade do |t|t.datetime "created_at", null: falset.datetime "updated_at", null: false@@ -284,15 +293,6 @@ ActiveRecord::Schema[7.2].define(version: 2024_06_20_114307) dot.index ["family_id"], name: "index_tags_on_family_id"end- create_table "transaction_merchants", id: :uuid, default: -> { "gen_random_uuid()" }, force: :cascade do |t|- t.string "name", null: false- t.string "color", default: "#e99537", null: false- t.uuid "family_id", null: false- t.datetime "created_at", null: false- t.datetime "updated_at", null: false- t.index ["family_id"], name: "index_transaction_merchants_on_family_id"- end-create_table "transactions", id: :uuid, default: -> { "gen_random_uuid()" }, force: :cascade do |t|t.string "name"t.date "date", null: false@@ -359,12 +359,12 @@ ActiveRecord::Schema[7.2].define(version: 2024_06_20_114307) doadd_foreign_key "categories", "families"add_foreign_key "imports", "accounts"add_foreign_key "institutions", "families"+ add_foreign_key "merchants", "families"add_foreign_key "taggings", "tags"add_foreign_key "tags", "families"- add_foreign_key "transaction_merchants", "families"add_foreign_key "transactions", "accounts", on_delete: :cascadeadd_foreign_key "transactions", "categories", on_delete: :nullify- add_foreign_key "transactions", "transaction_merchants", column: "merchant_id"+ add_foreign_key "transactions", "merchants"add_foreign_key "transactions", "transfers"add_foreign_key "users", "families"add_foreign_key "valuations", "accounts", on_delete: :cascadediff --git a/test/controllers/merchants_controller_test.rb b/test/controllers/merchants_controller_test.rbnew file mode 100644index 00000000..4f84bb0d--- /dev/null+++ b/test/controllers/merchants_controller_test.rb@@ -0,0 +1,39 @@+require "test_helper"++class MerchantsControllerTest < ActionDispatch::IntegrationTest+ setup do+ sign_in @user = users(:family_admin)+ @merchant = merchants(:netflix)+ end++ test "index" do+ get merchants_path+ assert_response :success+ end++ test "new" do+ get new_merchant_path+ assert_response :success+ end++ test "should create merchant" do+ assert_difference("Merchant.count") do+ post merchants_url, params: { merchant: { name: "new merchant", color: "#000000" } }+ end++ assert_redirected_to merchants_path+ end++ test "should update merchant" do+ patch merchant_url(@merchant), params: { merchant: { name: "new name", color: "#000000" } }+ assert_redirected_to merchants_path+ end++ test "should destroy merchant" do+ assert_difference("Merchant.count", -1) do+ delete merchant_url(@merchant)+ end++ assert_redirected_to merchants_path+ end+enddiff --git a/test/controllers/transactions/merchants_controller_test.rb b/test/controllers/transactions/merchants_controller_test.rbdeleted file mode 100644index fab1fd71..00000000--- a/test/controllers/transactions/merchants_controller_test.rb+++ /dev/null@@ -1,39 +0,0 @@-require "test_helper"--class Transactions::MerchantsControllerTest < ActionDispatch::IntegrationTest- setup do- sign_in @user = users(:family_admin)- @merchant = transaction_merchants(:netflix)- end-- test "index" do- get transaction_merchants_path- assert_response :success- end-- test "new" do- get new_transaction_merchant_path- assert_response :success- end-- test "should create merchant" do- assert_difference("Transaction::Merchant.count") do- post transaction_merchants_url, params: { transaction_merchant: { name: "new merchant", color: "#000000" } }- end-- assert_redirected_to transaction_merchants_path- end-- test "should update merchant" do- patch transaction_merchant_url(@merchant), params: { transaction_merchant: { name: "new name", color: "#000000" } }- assert_redirected_to transaction_merchants_path- end-- test "should destroy merchant" do- assert_difference("Transaction::Merchant.count", -1) do- delete transaction_merchant_url(@merchant)- end-- assert_redirected_to transaction_merchants_path- end-enddiff --git a/test/controllers/transactions_controller_test.rb b/test/controllers/transactions_controller_test.rbindex b31fe159..7dbcde8d 100644--- a/test/controllers/transactions_controller_test.rb+++ b/test/controllers/transactions_controller_test.rb@@ -160,7 +160,7 @@ class TransactionsControllerTest < ActionDispatch::IntegrationTesttransaction.update! \excluded: false,category_id: Category.first.id,- merchant_id: Transaction::Merchant.first.id,+ merchant_id: Merchant.first.id,notes: "Starting note"end@@ -170,7 +170,7 @@ class TransactionsControllerTest < ActionDispatch::IntegrationTesttransaction_ids: transactions.map(&:id),excluded: true,category_id: Category.second.id,- merchant_id: Transaction::Merchant.second.id,+ merchant_id: Merchant.second.id,notes: "Updated note"}}@@ -182,7 +182,7 @@ class TransactionsControllerTest < ActionDispatch::IntegrationTestassert_equal Date.current, transaction.dateassert transaction.excludedassert_equal Category.second, transaction.category- assert_equal Transaction::Merchant.second, transaction.merchant+ assert_equal Merchant.second, transaction.merchantassert_equal "Updated note", transaction.notesendenddiff --git a/test/fixtures/transaction/merchants.yml b/test/fixtures/merchants.ymlsimilarity index 100%rename from test/fixtures/transaction/merchants.ymlrename to test/fixtures/merchants.ymldiff --git a/test/models/family_test.rb b/test/models/family_test.rbindex 55218957..96eb2cdc 100644--- a/test/models/family_test.rb+++ b/test/models/family_test.rb@@ -39,7 +39,7 @@ class FamilyTest < ActiveSupport::TestCaseendtest "should destroy dependent merchants" do- assert_difference("Transaction::Merchant.count", [email protected]_merchants.count) do+ assert_difference("Merchant.count", [email protected]) do@family.destroyendenddiff --git a/test/system/settings_test.rb b/test/system/settings_test.rbindex e9be8a86..1c844ebd 100644--- a/test/system/settings_test.rb+++ b/test/system/settings_test.rb@@ -13,7 +13,7 @@ class SettingsTest < ApplicationSystemTestCase[ "Accounts", "Accounts", accounts_path ],[ "Tags", "Tags", tags_path ],[ "Categories", "Categories", categories_path ],- [ "Merchants", "Merchants", transaction_merchants_path ],+ [ "Merchants", "Merchants", merchants_path ],[ "Rules", "Rules", transaction_rules_path ],[ "Imports", "Imports", imports_path ],[ "What's New", "What's New", changelog_path ],diff --git a/test/system/transactions_test.rb b/test/system/transactions_test.rbindex f75edd76..097d8d8e 100644--- a/test/system/transactions_test.rb+++ b/test/system/transactions_test.rb@@ -6,7 +6,7 @@ class TransactionsTest < ApplicationSystemTestCase@latest_transactions = @user.family.transactions.ordered.limit(20).to_a@test_category = @user.family.categories.create! name: "System Test Category"- @test_merchant = @user.family.transaction_merchants.create! name: "System Test Merchant"+ @test_merchant = @user.family.merchants.create! name: "System Test Merchant"@target_txn = @user.family.accounts.first.transactions.create! \name: "Oldest transaction",date: 10.years.ago.to_date,