Rename factory 'project_with_trackers' to 'project_with_types'.

pull/6827/head
Christian Rijke 11 years ago
parent febc8cf420
commit b4c52d2e62
  1. 2
      spec/models/cost_query/filter_spec.rb
  2. 6
      spec/models/cost_query/group_by_spec.rb
  3. 4
      spec/models/cost_query/integration_spec.rb
  4. 2
      spec/models/cost_query/result_spec.rb
  5. 2
      spec/models/cost_query/walker_spec.rb

@ -3,7 +3,7 @@ require File.expand_path(File.dirname(__FILE__) + '/../../spec_helper')
describe CostQuery, :reporting_query_helper => true do describe CostQuery, :reporting_query_helper => true do
minimal_query minimal_query
let!(:project) { FactoryGirl.create(:project_with_trackers) } let!(:project) { FactoryGirl.create(:project_with_types) }
let!(:user) { FactoryGirl.create(:user, :member_in_project => project) } let!(:user) { FactoryGirl.create(:user, :member_in_project => project) }
def create_work_package_with_entry(entry_type, work_package_params={}, entry_params = {}) def create_work_package_with_entry(entry_type, work_package_params={}, entry_params = {})

@ -1,7 +1,7 @@
require File.expand_path(File.dirname(__FILE__) + '/../../spec_helper') require File.expand_path(File.dirname(__FILE__) + '/../../spec_helper')
describe CostQuery, :reporting_query_helper => true do describe CostQuery, :reporting_query_helper => true do
let!(:project1){ FactoryGirl.create(:project_with_trackers) } let!(:project1){ FactoryGirl.create(:project_with_types) }
let!(:work_package1) { FactoryGirl.create(:work_package, project: project1) } let!(:work_package1) { FactoryGirl.create(:work_package, project: project1) }
let!(:time_entry1) { FactoryGirl.create(:time_entry, work_package: work_package1, project: project1, spent_on: Date.new(2012, 1, 1)) } let!(:time_entry1) { FactoryGirl.create(:time_entry, work_package: work_package1, project: project1, spent_on: Date.new(2012, 1, 1)) }
let!(:time_entry2) do let!(:time_entry2) do
@ -17,7 +17,7 @@ describe CostQuery, :reporting_query_helper => true do
cost_entry2 cost_entry2
end end
let!(:project2) { FactoryGirl.create(:project_with_trackers) } let!(:project2) { FactoryGirl.create(:project_with_types) }
let!(:work_package2) { FactoryGirl.create(:work_package, project: project2) } let!(:work_package2) { FactoryGirl.create(:work_package, project: project2) }
let!(:time_entry3) { FactoryGirl.create(:time_entry, work_package: work_package2, project: project2, spent_on: Date.new(2013, 2, 3)) } let!(:time_entry3) { FactoryGirl.create(:time_entry, work_package: work_package2, project: project2, spent_on: Date.new(2013, 2, 3)) }
let!(:time_entry4) do let!(:time_entry4) do
@ -195,7 +195,7 @@ describe CostQuery, :reporting_query_helper => true do
end end
describe CostQuery::GroupBy::CustomFieldEntries do describe CostQuery::GroupBy::CustomFieldEntries do
let!(:project){ FactoryGirl.create(:project_with_trackers) } let!(:project){ FactoryGirl.create(:project_with_types) }
before do before do
create_work_package_custom_field("Searchable Field") create_work_package_custom_field("Searchable Field")

@ -3,12 +3,12 @@ require File.expand_path(File.dirname(__FILE__) + '/../../spec_helper')
describe CostQuery, :reporting_query_helper => true do describe CostQuery, :reporting_query_helper => true do
minimal_query minimal_query
let!(:project1){ FactoryGirl.create(:project_with_trackers) } let!(:project1){ FactoryGirl.create(:project_with_types) }
let!(:work_package1) { FactoryGirl.create(:work_package, project: project1) } let!(:work_package1) { FactoryGirl.create(:work_package, project: project1) }
let!(:time_entry1) { FactoryGirl.create(:time_entry, work_package: work_package1, project: project1) } let!(:time_entry1) { FactoryGirl.create(:time_entry, work_package: work_package1, project: project1) }
let!(:time_entry2) { FactoryGirl.create(:time_entry, work_package: work_package1, project: project1) } let!(:time_entry2) { FactoryGirl.create(:time_entry, work_package: work_package1, project: project1) }
let!(:project2) { FactoryGirl.create(:project_with_trackers) } let!(:project2) { FactoryGirl.create(:project_with_types) }
let!(:work_package2) { FactoryGirl.create(:work_package, project: project2) } let!(:work_package2) { FactoryGirl.create(:work_package, project: project2) }
let!(:time_entry3) { FactoryGirl.create(:time_entry, work_package: work_package2, project: project2) } let!(:time_entry3) { FactoryGirl.create(:time_entry, work_package: work_package2, project: project2) }
let!(:time_entry4) { FactoryGirl.create(:time_entry, work_package: work_package2, project: project2) } let!(:time_entry4) { FactoryGirl.create(:time_entry, work_package: work_package2, project: project2) }

@ -3,7 +3,7 @@ require File.expand_path(File.dirname(__FILE__) + '/../../spec_helper')
describe CostQuery, :reporting_query_helper => true do describe CostQuery, :reporting_query_helper => true do
before do before do
FactoryGirl.create(:admin) FactoryGirl.create(:admin)
project = FactoryGirl.create(:project_with_trackers) project = FactoryGirl.create(:project_with_types)
work_package = FactoryGirl.create(:work_package, project: project) work_package = FactoryGirl.create(:work_package, project: project)
FactoryGirl.create(:time_entry, work_package: work_package, project: project) FactoryGirl.create(:time_entry, work_package: work_package, project: project)
FactoryGirl.create(:cost_entry, work_package: work_package, project: project) FactoryGirl.create(:cost_entry, work_package: work_package, project: project)

@ -5,7 +5,7 @@ describe CostQuery, :reporting_query_helper => true do
before do before do
FactoryGirl.create(:admin) FactoryGirl.create(:admin)
project = FactoryGirl.create(:project_with_trackers) project = FactoryGirl.create(:project_with_types)
work_package = FactoryGirl.create(:work_package, project: project) work_package = FactoryGirl.create(:work_package, project: project)
FactoryGirl.create(:time_entry, work_package: work_package, project: project) FactoryGirl.create(:time_entry, work_package: work_package, project: project)
end end

Loading…
Cancel
Save