From a2c7e73df4ec51323030b06adad15c35c8dbf531 Mon Sep 17 00:00:00 2001 From: Tim Felgentreff Date: Wed, 3 Nov 2010 18:42:42 +0100 Subject: [PATCH] adjust tests to fixtures --- test/fixtures/journals.yml | 2 +- test/functional/activities_controller_test.rb | 8 ++++---- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/test/fixtures/journals.yml b/test/fixtures/journals.yml index c8ecc192..a7e888dd 100644 --- a/test/fixtures/journals.yml +++ b/test/fixtures/journals.yml @@ -30,7 +30,7 @@ journals_003: id: 3 type: "IssueJournal" activity_type: "issues" - created_at: <%= 1.days.ago.to_date.to_s(:db) %> + created_at: <%= 2.days.ago.to_date.to_s(:db) %> version: 1 user_id: 2 notes: "A comment with inline image: !picture.jpg!" diff --git a/test/functional/activities_controller_test.rb b/test/functional/activities_controller_test.rb index ba9c3398..293fab01 100644 --- a/test/functional/activities_controller_test.rb +++ b/test/functional/activities_controller_test.rb @@ -10,10 +10,10 @@ class ActivitiesControllerTest < ActionController::TestCase assert_not_nil assigns(:events_by_day) assert_tag :tag => "h3", - :content => /#{2.days.ago.to_date.day}/, + :content => /#{1.day.ago.to_date.day}/, :sibling => { :tag => "dl", :child => { :tag => "dt", - :attributes => { :class => /issue-edit/ }, + :attributes => { :class => /issue/ }, :child => { :tag => "a", :content => /(#{IssueStatus.find(2).name})/, } @@ -46,12 +46,12 @@ class ActivitiesControllerTest < ActionController::TestCase assert_not_nil assigns(:events_by_day) assert_tag :tag => "h3", - :content => /#{5.day.ago.to_date.day}/, + :content => /#{3.day.ago.to_date.day}/, :sibling => { :tag => "dl", :child => { :tag => "dt", :attributes => { :class => /issue/ }, :child => { :tag => "a", - :content => /#{Issue.find(5).subject}/, + :content => /#{Issue.find(1).subject}/, } } }