comparison test/functional/project_enumerations_controller_test.rb @ 524:1248a47e81b3 feature_36

Merge from branch "luisf"
author luisf <luis.figueira@eecs.qmul.ac.uk>
date Mon, 25 Jul 2011 14:39:38 +0100
parents cd2282d2aa55
children 5e80956cc792
comparison
equal deleted inserted replaced
519:3be6bc3c2a17 524:1248a47e81b3
1 require File.dirname(__FILE__) + '/../test_helper' 1 require File.expand_path('../../test_helper', __FILE__)
2 2
3 class ProjectEnumerationsControllerTest < ActionController::TestCase 3 class ProjectEnumerationsControllerTest < ActionController::TestCase
4 fixtures :all 4 fixtures :all
5 5
6 def setup 6 def setup
173 :project => Project.find(1), 173 :project => Project.find(1),
174 :active => true 174 :active => true
175 }) 175 })
176 assert project_activity.save 176 assert project_activity.save
177 assert TimeEntry.update_all("activity_id = '#{project_activity.id}'", ["project_id = ? AND activity_id = ?", 1, 9]) 177 assert TimeEntry.update_all("activity_id = '#{project_activity.id}'", ["project_id = ? AND activity_id = ?", 1, 9])
178 assert 3, TimeEntry.find_all_by_activity_id_and_project_id(project_activity.id, 1).size 178 assert_equal 3, TimeEntry.find_all_by_activity_id_and_project_id(project_activity.id, 1).size
179 179
180 delete :destroy, :project_id => 1 180 delete :destroy, :project_id => 1
181 assert_response :redirect 181 assert_response :redirect
182 assert_redirected_to '/projects/ecookbook/settings/activities' 182 assert_redirected_to '/projects/ecookbook/settings/activities'
183 183