diff --git a/spec/models/cost_query/filter_spec.rb b/spec/models/cost_query/filter_spec.rb index 6c8a5e6ea8..f4e983a694 100644 --- a/spec/models/cost_query/filter_spec.rb +++ b/spec/models/cost_query/filter_spec.rb @@ -3,7 +3,7 @@ require File.expand_path(File.dirname(__FILE__) + '/../../spec_helper') describe CostQuery, :reporting_query_helper => true do 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) } def create_work_package_with_entry(entry_type, work_package_params={}, entry_params = {}) diff --git a/spec/models/cost_query/group_by_spec.rb b/spec/models/cost_query/group_by_spec.rb index 1fb3227cbb..cd9ab38eb0 100644 --- a/spec/models/cost_query/group_by_spec.rb +++ b/spec/models/cost_query/group_by_spec.rb @@ -1,7 +1,7 @@ require File.expand_path(File.dirname(__FILE__) + '/../../spec_helper') 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!(:time_entry1) { FactoryGirl.create(:time_entry, work_package: work_package1, project: project1, spent_on: Date.new(2012, 1, 1)) } let!(:time_entry2) do @@ -17,7 +17,7 @@ describe CostQuery, :reporting_query_helper => true do cost_entry2 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!(:time_entry3) { FactoryGirl.create(:time_entry, work_package: work_package2, project: project2, spent_on: Date.new(2013, 2, 3)) } let!(:time_entry4) do @@ -195,7 +195,7 @@ describe CostQuery, :reporting_query_helper => true do end describe CostQuery::GroupBy::CustomFieldEntries do - let!(:project){ FactoryGirl.create(:project_with_trackers) } + let!(:project){ FactoryGirl.create(:project_with_types) } before do create_work_package_custom_field("Searchable Field") diff --git a/spec/models/cost_query/integration_spec.rb b/spec/models/cost_query/integration_spec.rb index 2244b93bd0..396c61ac13 100644 --- a/spec/models/cost_query/integration_spec.rb +++ b/spec/models/cost_query/integration_spec.rb @@ -3,12 +3,12 @@ require File.expand_path(File.dirname(__FILE__) + '/../../spec_helper') describe CostQuery, :reporting_query_helper => true do 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!(: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!(:project2) { FactoryGirl.create(:project_with_trackers) } + let!(:project2) { FactoryGirl.create(:project_with_types) } let!(:work_package2) { FactoryGirl.create(:work_package, 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) } diff --git a/spec/models/cost_query/result_spec.rb b/spec/models/cost_query/result_spec.rb index 226a78b66e..f8fdcb397b 100644 --- a/spec/models/cost_query/result_spec.rb +++ b/spec/models/cost_query/result_spec.rb @@ -3,7 +3,7 @@ require File.expand_path(File.dirname(__FILE__) + '/../../spec_helper') describe CostQuery, :reporting_query_helper => true do before do FactoryGirl.create(:admin) - project = FactoryGirl.create(:project_with_trackers) + project = FactoryGirl.create(:project_with_types) work_package = FactoryGirl.create(:work_package, project: project) FactoryGirl.create(:time_entry, work_package: work_package, project: project) FactoryGirl.create(:cost_entry, work_package: work_package, project: project) diff --git a/spec/models/cost_query/walker_spec.rb b/spec/models/cost_query/walker_spec.rb index a58f4d2e81..fb8e72a6ec 100644 --- a/spec/models/cost_query/walker_spec.rb +++ b/spec/models/cost_query/walker_spec.rb @@ -5,7 +5,7 @@ describe CostQuery, :reporting_query_helper => true do before do FactoryGirl.create(:admin) - project = FactoryGirl.create(:project_with_trackers) + project = FactoryGirl.create(:project_with_types) work_package = FactoryGirl.create(:work_package, project: project) FactoryGirl.create(:time_entry, work_package: work_package, project: project) end