Skip to content

O
OHR Support
Commit 3b51eb54 authored by Tim Felgentreff's avatar Tim Felgentreff
Browse files
Options

fix 2 more tests

parent e8af8d19
Hide whitespace changes
Inline Side-by-side
Showing with 2 additions and 2 deletions
app/models/query.rb
View file @ 3b51eb54
...@@ -490,7 +490,7 @@ class Query < ActiveRecord::Base ...@@ -490,7 +490,7 @@ class Query < ActiveRecord::Base
# Returns the journals # Returns the journals
# Valid options are :order, :offset, :limit # Valid options are :order, :offset, :limit
def journals(options={}) def journals(options={})
Journal.find :all, :include => [:user, {:issue => [:project, :author, :tracker, :status]}], Journal.find :all, :include => [:user, :journaled],
:conditions => statement, :conditions => statement,
:order => options[:order], :order => options[:order],
:limit => options[:limit], :limit => options[:limit],
......
test/functional/issues_controller_test.rb
View file @ 3b51eb54
...@@ -996,7 +996,7 @@ class IssuesControllerTest < ActionController::TestCase ...@@ -996,7 +996,7 @@ class IssuesControllerTest < ActionController::TestCase
assert_response 302 assert_response 302
issue = Issue.find(1) issue = Issue.find(1)
journal = issue.journals.find(:first, :order => 'created_on DESC') journal = issue.journals.find(:first, :order => 'created_at DESC')
assert_equal '777', issue.custom_value_for(2).value assert_equal '777', issue.custom_value_for(2).value
assert_equal 1, journal.details.size assert_equal 1, journal.details.size
assert_equal '125', journal.details.first.old_value assert_equal '125', journal.details.first.old_value
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment