tests all pass

test/fixtures/actors.yml

@@ -0,0 +1,49 @@
+# --------------------------------------------------------------
+# john
+# --------------------------------------------------------------
+
+john_starting_balance:
+  subscription: john
+  name: Starting balance
+  sort_name: STARTING BALANCE
+  created_at: <%= (60.days.ago + 1.hour).utc.to_s(:db) %>
+  updated_at: <%= (60.days.ago + 1.hour).utc.to_s(:db) %>
+
+john_sandwich_central:
+  subscription: john
+  name: Sandwich Central
+  sort_name: SANDWICH CENTRAL
+  created_at: <%= 59.days.ago.utc.to_s(:db) %>
+  updated_at: <%= 55.days.ago.utc.to_s(:db) %>
+
+john_mastercard_co:
+  subscription: john
+  name: MasterCard Co.
+  sort_name: MASTERCARD CO.
+  created_at: <%= 58.days.ago.utc.to_s(:db) %>
+  updated_at: <%= 58.days.ago.utc.to_s(:db) %>
+
+john_bucket_reallocation:
+  subscription: john
+  name: Bucket reallocation
+  sort_name: BUCKET REALLOCATION
+  created_at: <%= 57.days.ago.utc.to_s(:db) %>
+  updated_at: <%= 56.days.ago.utc.to_s(:db) %>
+
+john_auto_fuel:
+  subscription: john
+  name: Auto fuel
+  sort_name: AUTO FUEL
+  created_at: <%= 54.days.ago.utc.to_s(:db) %>
+  updated_at: <%= 54.days.ago.utc.to_s(:db) %>
+
+# --------------------------------------------------------------
+# tim
+# --------------------------------------------------------------
+
+tim_starting_balance:
+  subscription: tim
+  name: Starting balance
+  sort_name: STARTING BALANCE
+  created_at: <%= (59.days.ago + 1.hour).utc.to_s(:db) %>
+  updated_at: <%= (59.days.ago + 1.hour).utc.to_s(:db) %>

test/fixtures/events.yml

@@ -6,7 +6,8 @@ john_checking_starting_balance:
   subscription: john
   user: john
   occurred_on: <%= 60.days.ago.to_date.to_s(:db) %>
-  actor: Starting balance
+  actor: john_starting_balance
+  actor_name: Starting balance
   check_number: ~
   created_at: <%= (60.days.ago + 1.hour).utc.to_s(:db) %>
   updated_at: <%= (60.days.ago + 1.hour).utc.to_s(:db) %>
@@ -15,7 +16,8 @@ john_lunch:
   subscription: john
   user: john
   occurred_on: <%= 59.days.ago.to_date.to_s(:db) %>
-  actor: Sandwich Central
+  actor_name: Sandwich Central
+  actor: john_sandwich_central
   check_number: ~
   created_at: <%= 59.days.ago.utc.to_s(:db) %>
   updated_at: <%= 59.days.ago.utc.to_s(:db) %>
@@ -24,7 +26,8 @@ john_bill_pay:
   subscription: john
   user: john
   occurred_on: <%= 58.days.ago.to_date.to_s(:db) %>
-  actor: MasterCard Co.
+  actor_name: MasterCard Co.
+  actor: john_mastercard_co
   check_number: 1234
   created_at: <%= 58.days.ago.utc.to_s(:db) %>
   updated_at: <%= 58.days.ago.utc.to_s(:db) %>
@@ -33,7 +36,8 @@ john_reallocate_from:
   subscription: john
   user: john
   occurred_on: <%= 57.days.ago.to_date.to_s(:db) %>
-  actor: Bucket reallocation
+  actor_name: Bucket reallocation
+  actor: john_bucket_reallocation
   check_number: ~
   created_at: <%= 57.days.ago.utc.to_s(:db) %>
   updated_at: <%= 57.days.ago.utc.to_s(:db) %>
@@ -42,7 +46,8 @@ john_reallocate_to:
   subscription: john
   user: john
   occurred_on: <%= 56.days.ago.to_date.to_s(:db) %>
-  actor: Bucket reallocation
+  actor_name: Bucket reallocation
+  actor: john_bucket_reallocation
   check_number: ~
   created_at: <%= 56.days.ago.utc.to_s(:db) %>
   updated_at: <%= 56.days.ago.utc.to_s(:db) %>
@@ -51,7 +56,8 @@ john_lunch_again:
   subscription: john
   user: john
   occurred_on: <%= 55.days.ago.to_date.to_s(:db) %>
-  actor: Sandwich Central
+  actor_name: Sandwich Central
+  actor: john_sandwich_central
   check_number: ~
   created_at: <%= 55.days.ago.utc.to_s(:db) %>
   updated_at: <%= 55.days.ago.utc.to_s(:db) %>
@@ -60,7 +66,8 @@ john_bare_mastercard:
   subscription: john
   user: john
   occurred_on: <%= 54.days.ago.to_date.to_s(:db) %>
-  actor: Auto fuel
+  actor_name: Auto fuel
+  actor: john_auto_fuel
   check_number: ~
   created_at: <%= 54.days.ago.utc.to_s(:db) %>
   updated_at: <%= 54.days.ago.utc.to_s(:db) %>
@@ -73,7 +80,8 @@ tim_checking_starting_balance:
   subscription: tim
   user: tim
   occurred_on: <%= 59.days.ago.to_date.to_s(:db) %>
-  actor: Starting balance
+  actor_name: Starting balance
+  actor: tim_starting_balance
   check_number: ~
   created_at: <%= (59.days.ago + 1.hour).utc.to_s(:db) %>
   updated_at: <%= (59.days.ago + 1.hour).utc.to_s(:db) %>

test/functional/events_controller_test.rb

@@ -64,7 +64,7 @@ class EventsControllerTest < ActionController::TestCase
   test "update via ajax should load subscription and event, update event and render javascript" do
     event = events(:john_checking_starting_balance)
     xhr :post, :update, :id => event.id,
-      :event => { :occurred_on => event.occurred_on.to_s, :actor => "Updated: #{event.actor_name}" }
+      :event => { :occurred_on => event.occurred_on.to_s, :actor_name => "Updated: #{event.actor_name}" }
 
     assert_response :success
     assert_template "events/update.js.rjs"