Move merchants to top-level namespace (#895)

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
+end

test/controllers/transactions/merchants_controller_test.rb

@@ -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
-end

test/controllers/transactions_controller_test.rb

@@ -160,7 +160,7 @@ class TransactionsControllerTest < ActionDispatch::IntegrationTest
       transaction.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::IntegrationTest
         transaction_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::IntegrationTest
       assert_equal Date.current, transaction.date
       assert transaction.excluded
       assert_equal Category.second, transaction.category
-      assert_equal Transaction::Merchant.second, transaction.merchant
+      assert_equal Merchant.second, transaction.merchant
       assert_equal "Updated note", transaction.notes
     end
   end

test/models/family_test.rb

@@ -39,7 +39,7 @@ class FamilyTest < ActiveSupport::TestCase
   end
 
   test "should destroy dependent merchants" do
-    assert_difference("Transaction::Merchant.count", -@family.transaction_merchants.count) do
+    assert_difference("Merchant.count", -@family.merchants.count) do
       @family.destroy
     end
   end

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 ],

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,