From eef303c22201d1969b4570009840e07d68774f77 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Oliver=20G=C3=BCnther?= Date: Mon, 7 May 2018 15:20:39 +0200 Subject: [PATCH] FactoryGirl => FactoryBot (opf/openproject#6304) --- .../cost_reports_controller_spec.rb | 4 +- .../custom_fields_controller_spec.rb | 6 +- spec/factories/cost_query_factory.rb | 2 +- spec/features/calculations_spec.rb | 18 +++--- spec/features/custom_fields_spec.rb | 22 ++++---- spec/features/filter_spec.rb | 4 +- spec/features/grouping_spec.rb | 10 ++-- spec/features/menu_spec.rb | 4 +- spec/features/my_time_spec.rb | 12 ++-- spec/features/permissions_spec.rb | 24 ++++---- spec/features/project_context_spec.rb | 6 +- spec/features/saving_spec.rb | 8 +-- spec/features/subproject_spec.rb | 8 +-- spec/features/update_cost_report_spec.rb | 10 ++-- spec/models/cost_query/chaining_spec.rb | 2 +- spec/models/cost_query/cost_query_spec.rb | 8 +-- spec/models/cost_query/filter_spec.rb | 56 +++++++++---------- spec/models/cost_query/group_by_spec.rb | 28 +++++----- spec/models/cost_query/integration_spec.rb | 18 +++--- spec/models/cost_query/operator_spec.rb | 40 ++++++------- spec/models/cost_query/result_spec.rb | 10 ++-- spec/models/cost_query/walker_spec.rb | 8 +-- spec/requests/custom_field_cache_spec.rb | 8 +-- spec/support/plugin_spec_helper.rb | 4 +- 24 files changed, 160 insertions(+), 160 deletions(-) diff --git a/spec/controllers/cost_reports_controller_spec.rb b/spec/controllers/cost_reports_controller_spec.rb index 83c0a2f5..45b1aadd 100644 --- a/spec/controllers/cost_reports_controller_spec.rb +++ b/spec/controllers/cost_reports_controller_spec.rb @@ -22,8 +22,8 @@ describe CostReportsController, type: :controller do include OpenProject::Reporting::PluginSpecHelper - let(:user) { FactoryGirl.build(:user) } - let(:project) { FactoryGirl.build(:valid_project) } + let(:user) { FactoryBot.build(:user) } + let(:project) { FactoryBot.build(:valid_project) } describe "GET show" do before(:each) do diff --git a/spec/controllers/custom_fields_controller_spec.rb b/spec/controllers/custom_fields_controller_spec.rb index ad7d2e77..054219b8 100644 --- a/spec/controllers/custom_fields_controller_spec.rb +++ b/spec/controllers/custom_fields_controller_spec.rb @@ -29,11 +29,11 @@ require 'spec_helper' describe CustomFieldsController do - let!(:custom_field) { FactoryGirl.create(:work_package_custom_field) } - let!(:custom_field_permanent) { FactoryGirl.create(:work_package_custom_field) } + let!(:custom_field) { FactoryBot.create(:work_package_custom_field) } + let!(:custom_field_permanent) { FactoryBot.create(:work_package_custom_field) } let(:custom_field_name) { "CustomField#{custom_field.id}" } let(:custom_field_permanent_name) { "CustomField#{custom_field_permanent.id}" } - let(:cost_query) { FactoryGirl.build(:cost_query) } + let(:cost_query) { FactoryBot.build(:cost_query) } before do allow(@controller).to receive(:authorize) diff --git a/spec/factories/cost_query_factory.rb b/spec/factories/cost_query_factory.rb index 1e179316..5441da75 100644 --- a/spec/factories/cost_query_factory.rb +++ b/spec/factories/cost_query_factory.rb @@ -17,7 +17,7 @@ # Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. #++ -FactoryGirl.define do +FactoryBot.define do factory :cost_query do association :user, factory: :user association :project, factory: :project diff --git a/spec/features/calculations_spec.rb b/spec/features/calculations_spec.rb index 0dc2b87d..dfe7b5e1 100644 --- a/spec/features/calculations_spec.rb +++ b/spec/features/calculations_spec.rb @@ -1,16 +1,16 @@ require 'spec_helper' describe 'Cost report calculations', type: :feature, js: true do - let(:project) { FactoryGirl.create :project } - let(:user) { FactoryGirl.create :admin } + let(:project) { FactoryBot.create :project } + let(:user) { FactoryBot.create :admin } - let(:work_package) { FactoryGirl.create :work_package, project: project } - let!(:hourly_rate1) { FactoryGirl.create :default_hourly_rate, user: user, rate: 1.00, valid_from: 1.year.ago } - let!(:hourly_rate2) { FactoryGirl.create :default_hourly_rate, user: user, rate: 5.00, valid_from: 2.years.ago } - let!(:hourly_rate3) { FactoryGirl.create :default_hourly_rate, user: user, rate: 10.00, valid_from: 3.years.ago } + let(:work_package) { FactoryBot.create :work_package, project: project } + let!(:hourly_rate1) { FactoryBot.create :default_hourly_rate, user: user, rate: 1.00, valid_from: 1.year.ago } + let!(:hourly_rate2) { FactoryBot.create :default_hourly_rate, user: user, rate: 5.00, valid_from: 2.years.ago } + let!(:hourly_rate3) { FactoryBot.create :default_hourly_rate, user: user, rate: 10.00, valid_from: 3.years.ago } let!(:time_entry1) { - FactoryGirl.create :time_entry, + FactoryBot.create :time_entry, spent_on: 6.months.ago, user: user, work_package: work_package, @@ -18,7 +18,7 @@ hours: 10 } let!(:time_entry2) { - FactoryGirl.create :time_entry, + FactoryBot.create :time_entry, spent_on: 18.months.ago, user: user, work_package: work_package, @@ -26,7 +26,7 @@ hours: 10 } let!(:time_entry3) { - FactoryGirl.create :time_entry, + FactoryBot.create :time_entry, spent_on: 30.months.ago, user: user, work_package: work_package, diff --git a/spec/features/custom_fields_spec.rb b/spec/features/custom_fields_spec.rb index fee00a3b..ae7edb3e 100644 --- a/spec/features/custom_fields_spec.rb +++ b/spec/features/custom_fields_spec.rb @@ -20,19 +20,19 @@ require 'spec_helper' describe 'Custom fields reporting', type: :feature, js: true do - let(:type) { FactoryGirl.create :type } - let(:project) { FactoryGirl.create :project, types: [type] } + let(:type) { FactoryBot.create :type } + let(:project) { FactoryBot.create :project, types: [type] } - let(:user) { FactoryGirl.create :admin } + let(:user) { FactoryBot.create :admin } let(:work_package) { - FactoryGirl.create :work_package, + FactoryBot.create :work_package, project: project, custom_values: initial_custom_values } let!(:time_entry1) { - FactoryGirl.create :time_entry, + FactoryBot.create :time_entry, user: user, work_package: work_package, project: project, @@ -40,7 +40,7 @@ } let!(:time_entry2) { - FactoryGirl.create :time_entry, + FactoryBot.create :time_entry, user: user, work_package: work_package, project: project, @@ -54,7 +54,7 @@ def custom_value_for(cf, str) context 'with multi value cf' do let!(:custom_field) do - FactoryGirl.create( + FactoryBot.create( :list_wp_custom_field, name: "List CF", multi_value: true, @@ -132,7 +132,7 @@ def custom_value_for(cf, str) context 'with additional WP with invalid value' do let!(:custom_field_2) do - FactoryGirl.create( + FactoryBot.create( :list_wp_custom_field, name: "Invalid List CF", multi_value: true, @@ -143,13 +143,13 @@ def custom_value_for(cf, str) end let!(:work_package2) { - FactoryGirl.create :work_package, + FactoryBot.create :work_package, project: project, custom_values: { custom_field_2.id => custom_value_for(custom_field_2, 'A')} } let!(:time_entry1) { - FactoryGirl.create :time_entry, + FactoryBot.create :time_entry, user: user, work_package: work_package2, project: project, @@ -187,7 +187,7 @@ def custom_value_for(cf, str) context 'with text CF' do let(:custom_field) do - FactoryGirl.create( + FactoryBot.create( :text_wp_custom_field, name: 'Text CF', types: [type], diff --git a/spec/features/filter_spec.rb b/spec/features/filter_spec.rb index b6b8e449..045fdacc 100644 --- a/spec/features/filter_spec.rb +++ b/spec/features/filter_spec.rb @@ -1,8 +1,8 @@ require 'spec_helper' describe 'Cost report calculations', type: :feature, js: true do - let(:project) { FactoryGirl.create :project } - let(:user) { FactoryGirl.create :admin } + let(:project) { FactoryBot.create :project } + let(:user) { FactoryBot.create :admin } before do login_as(user) diff --git a/spec/features/grouping_spec.rb b/spec/features/grouping_spec.rb index f74ef505..daf6733d 100644 --- a/spec/features/grouping_spec.rb +++ b/spec/features/grouping_spec.rb @@ -2,16 +2,16 @@ require_relative 'support/pages/cost_report_page' describe 'Cost report calculations', type: :feature, js: true do - let(:project) { FactoryGirl.create :project } - let(:user) { FactoryGirl.create :admin } + let(:project) { FactoryBot.create :project } + let(:user) { FactoryBot.create :admin } - let(:work_package) { FactoryGirl.create :work_package, project: project } - let!(:hourly_rate1) { FactoryGirl.create :default_hourly_rate, user: user, rate: 1.00, valid_from: 1.year.ago } + let(:work_package) { FactoryBot.create :work_package, project: project } + let!(:hourly_rate1) { FactoryBot.create :default_hourly_rate, user: user, rate: 1.00, valid_from: 1.year.ago } let(:report_page) { ::Pages::CostReportPage.new project} let!(:time_entry1) { - FactoryGirl.create :time_entry, + FactoryBot.create :time_entry, spent_on: 6.months.ago, user: user, work_package: work_package, diff --git a/spec/features/menu_spec.rb b/spec/features/menu_spec.rb index 10a8964b..113ed1f2 100644 --- a/spec/features/menu_spec.rb +++ b/spec/features/menu_spec.rb @@ -29,8 +29,8 @@ require 'spec_helper' describe 'project menu', type: :feature do - let(:current_user) { FactoryGirl.create :admin } - let!(:project) { FactoryGirl.create :valid_project, identifier: 'ponyo', name: 'Ponyo' } + let(:current_user) { FactoryBot.create :admin } + let!(:project) { FactoryBot.create :valid_project, identifier: 'ponyo', name: 'Ponyo' } before do allow(User).to receive(:current).and_return current_user diff --git a/spec/features/my_time_spec.rb b/spec/features/my_time_spec.rb index c5783ac4..b61d38e7 100644 --- a/spec/features/my_time_spec.rb +++ b/spec/features/my_time_spec.rb @@ -1,15 +1,15 @@ require 'spec_helper' describe 'Cost report showing my own times', type: :feature, js: true do - let(:project) { FactoryGirl.create :project } - let(:user) { FactoryGirl.create :admin } - let(:user2) { FactoryGirl.create :admin } + let(:project) { FactoryBot.create :project } + let(:user) { FactoryBot.create :admin } + let(:user2) { FactoryBot.create :admin } - let(:work_package) { FactoryGirl.create :work_package, project: project } - let!(:hourly_rate1) { FactoryGirl.create :default_hourly_rate, user: user, rate: 1.00, valid_from: 1.year.ago } + let(:work_package) { FactoryBot.create :work_package, project: project } + let!(:hourly_rate1) { FactoryBot.create :default_hourly_rate, user: user, rate: 1.00, valid_from: 1.year.ago } let!(:time_entry1) { - FactoryGirl.create :time_entry, + FactoryBot.create :time_entry, user: user, work_package: work_package, project: project, diff --git a/spec/features/permissions_spec.rb b/spec/features/permissions_spec.rb index 3897ffdb..f432921f 100644 --- a/spec/features/permissions_spec.rb +++ b/spec/features/permissions_spec.rb @@ -2,44 +2,44 @@ require_relative 'support/pages/cost_report_page' describe 'Cost report calculations', type: :feature, js: true do - let(:project) { FactoryGirl.create :project } - let(:admin) { FactoryGirl.create :admin } + let(:project) { FactoryBot.create :project } + let(:admin) { FactoryBot.create :admin } let!(:permissions) { %i(view_cost_entries view_own_cost_entries) } - let!(:role) { FactoryGirl.create :role, permissions: permissions } + let!(:role) { FactoryBot.create :role, permissions: permissions } let!(:user) do - FactoryGirl.create :user, + FactoryBot.create :user, member_in_project: project, member_through_role: role end - let(:work_package) { FactoryGirl.create :work_package, project: project } - let!(:hourly_rate_admin) { FactoryGirl.create :default_hourly_rate, user: admin, rate: 1.00, valid_from: 1.year.ago } - let!(:hourly_rate_user) { FactoryGirl.create :default_hourly_rate, user: user, rate: 1.00, valid_from: 1.year.ago } + let(:work_package) { FactoryBot.create :work_package, project: project } + let!(:hourly_rate_admin) { FactoryBot.create :default_hourly_rate, user: admin, rate: 1.00, valid_from: 1.year.ago } + let!(:hourly_rate_user) { FactoryBot.create :default_hourly_rate, user: user, rate: 1.00, valid_from: 1.year.ago } let(:report_page) { ::Pages::CostReportPage.new project } let!(:time_entry_user) { - FactoryGirl.create :time_entry, + FactoryBot.create :time_entry, user: admin, work_package: work_package, project: project, hours: 10 } let!(:time_entry_admin) { - FactoryGirl.create :time_entry, + FactoryBot.create :time_entry, user: user, work_package: work_package, project: project, hours: 5 } let!(:cost_type) { - type = FactoryGirl.create :cost_type, name: 'Translations' - FactoryGirl.create :cost_rate, cost_type: type, rate: 7.00 + type = FactoryBot.create :cost_type, name: 'Translations' + FactoryBot.create :cost_rate, cost_type: type, rate: 7.00 type } let!(:cost_entry_user) { - FactoryGirl.create :cost_entry, + FactoryBot.create :cost_entry, work_package: work_package, project: project, units: 3.00, diff --git a/spec/features/project_context_spec.rb b/spec/features/project_context_spec.rb index 85c09653..21d0a06a 100644 --- a/spec/features/project_context_spec.rb +++ b/spec/features/project_context_spec.rb @@ -2,9 +2,9 @@ require_relative 'support/pages/cost_report_page' describe 'Cost report project context', type: :feature, js: true do - let(:project1) { FactoryGirl.create :project } - let(:project2) { FactoryGirl.create :project } - let(:admin) { FactoryGirl.create :admin } + let(:project1) { FactoryBot.create :project } + let(:project2) { FactoryBot.create :project } + let(:admin) { FactoryBot.create :admin } let(:report_page) { ::Pages::CostReportPage.new project } diff --git a/spec/features/saving_spec.rb b/spec/features/saving_spec.rb index 5ed957ea..f37ec58e 100644 --- a/spec/features/saving_spec.rb +++ b/spec/features/saving_spec.rb @@ -2,8 +2,8 @@ require_relative 'support/pages/cost_report_page' describe 'Cost report saving', type: :feature, js: true do - let(:project) { FactoryGirl.create :project } - let(:user) { FactoryGirl.create :admin } + let(:project) { FactoryBot.create :project } + let(:user) { FactoryBot.create :admin } let(:report_page) { ::Pages::CostReportPage.new project } @@ -43,9 +43,9 @@ end context 'as user without permissions' do - let(:role) { FactoryGirl.create :role, permissions: %i(view_time_entries) } + let(:role) { FactoryBot.create :role, permissions: %i(view_time_entries) } let!(:user) do - FactoryGirl.create :user, + FactoryBot.create :user, member_in_project: project, member_through_role: role end diff --git a/spec/features/subproject_spec.rb b/spec/features/subproject_spec.rb index c65debdb..fef21134 100644 --- a/spec/features/subproject_spec.rb +++ b/spec/features/subproject_spec.rb @@ -1,12 +1,12 @@ require 'spec_helper' describe 'Cost report in subproject', type: :feature, js: true do - let!(:project) { FactoryGirl.create :project } - let!(:subproject) { FactoryGirl.create :project, parent: project } + let!(:project) { FactoryBot.create :project } + let!(:subproject) { FactoryBot.create :project, parent: project } - let!(:role) { FactoryGirl.create :role, permissions: %i(view_cost_entries view_own_cost_entries) } + let!(:role) { FactoryBot.create :role, permissions: %i(view_cost_entries view_own_cost_entries) } let!(:user) do - FactoryGirl.create :user, + FactoryBot.create :user, member_in_project: subproject, member_through_role: role end diff --git a/spec/features/update_cost_report_spec.rb b/spec/features/update_cost_report_spec.rb index 82e96362..1f256344 100644 --- a/spec/features/update_cost_report_spec.rb +++ b/spec/features/update_cost_report_spec.rb @@ -21,19 +21,19 @@ require_relative 'support/pages/cost_report_page' describe "updating a cost report's cost type", type: :feature, js: true do - let(:project) { FactoryGirl.create :project_with_types } + let(:project) { FactoryBot.create :project_with_types } let(:user) do - FactoryGirl.create(:admin).tap do |user| - project.add_member! user, FactoryGirl.create(:role) + FactoryBot.create(:admin).tap do |user| + project.add_member! user, FactoryBot.create(:role) end end let(:cost_type) do - FactoryGirl.create :cost_type, name: 'Post-war', unit: 'cap', unit_plural: 'caps' + FactoryBot.create :cost_type, name: 'Post-war', unit: 'cap', unit_plural: 'caps' end let!(:cost_entry) do - FactoryGirl.create :cost_entry, user: user, project: project, cost_type: cost_type + FactoryBot.create :cost_entry, user: user, project: project, cost_type: cost_type end let(:report_page) { ::Pages::CostReportPage.new project } diff --git a/spec/models/cost_query/chaining_spec.rb b/spec/models/cost_query/chaining_spec.rb index 73126b94..86d555f2 100644 --- a/spec/models/cost_query/chaining_spec.rb +++ b/spec/models/cost_query/chaining_spec.rb @@ -20,7 +20,7 @@ require File.expand_path(File.dirname(__FILE__) + '/../../spec_helper') describe CostQuery, type: :model, reporting_query_helper: true do - let(:project) { FactoryGirl.create(:project) } + let(:project) { FactoryBot.create(:project) } minimal_query diff --git a/spec/models/cost_query/cost_query_spec.rb b/spec/models/cost_query/cost_query_spec.rb index af4aab5e..bdafe702 100644 --- a/spec/models/cost_query/cost_query_spec.rb +++ b/spec/models/cost_query/cost_query_spec.rb @@ -21,10 +21,10 @@ describe User, "#destroy", type: :model do let(:substitute_user) { DeletedUser.first } - let(:private_query) { FactoryGirl.create(:private_cost_query) } - let(:public_query) { FactoryGirl.create(:public_cost_query) } - let(:user) { FactoryGirl.create(:user) } - let(:user2) { FactoryGirl.create(:user) } + let(:private_query) { FactoryBot.create(:private_cost_query) } + let(:public_query) { FactoryBot.create(:public_cost_query) } + let(:user) { FactoryBot.create(:user) } + let(:user2) { FactoryBot.create(:user) } describe "WHEN the user has saved private cost queries" do diff --git a/spec/models/cost_query/filter_spec.rb b/spec/models/cost_query/filter_spec.rb index de78c0b3..3fb2915e 100644 --- a/spec/models/cost_query/filter_spec.rb +++ b/spec/models/cost_query/filter_spec.rb @@ -23,16 +23,16 @@ describe CostQuery, type: :model, reporting_query_helper: true do minimal_query - let!(:project) { FactoryGirl.create(:project_with_types) } - let!(:user) { FactoryGirl.create(:user, member_in_project: project) } + let!(:project) { FactoryBot.create(:project_with_types) } + let!(:user) { FactoryBot.create(:user, member_in_project: project) } def create_work_package_with_entry(entry_type, work_package_params={}, entry_params = {}) work_package_params = {project: project}.merge!(work_package_params) - work_package = FactoryGirl.create(:work_package, work_package_params) + work_package = FactoryBot.create(:work_package, work_package_params) entry_params = {work_package: work_package, project: work_package_params[:project], user: user}.merge!(entry_params) - FactoryGirl.create(entry_type, entry_params) + FactoryBot.create(entry_type, entry_params) work_package end @@ -67,18 +67,18 @@ def create_work_package_with_time_entry(work_package_params={}, entry_params = { [CostQuery::Filter::ActivityId, 'activity', "activity_id", 1], ].each do |filter, object_name, field, expected_count| describe filter do - let!(:non_matching_entry) { FactoryGirl.create(:cost_entry) } + let!(:non_matching_entry) { FactoryBot.create(:cost_entry) } let!(:object) { send(object_name) } - let!(:author) { FactoryGirl.create(:user, member_in_project: project) } - let!(:work_package) { FactoryGirl.create(:work_package, project: project, + let!(:author) { FactoryBot.create(:user, member_in_project: project) } + let!(:work_package) { FactoryBot.create(:work_package, project: project, author: author) } - let!(:cost_type) { FactoryGirl.create(:cost_type) } - let!(:cost_entry) { FactoryGirl.create(:cost_entry, work_package: work_package, + let!(:cost_type) { FactoryBot.create(:cost_type) } + let!(:cost_entry) { FactoryBot.create(:cost_entry, work_package: work_package, user: user, project: project, cost_type: cost_type) } - let!(:activity) { FactoryGirl.create(:time_entry_activity) } - let!(:time_entry) { FactoryGirl.create(:time_entry, work_package: work_package, + let!(:activity) { FactoryBot.create(:time_entry_activity) } + let!(:time_entry) { FactoryBot.create(:time_entry, work_package: work_package, user: user, project: project, activity: activity) } @@ -114,17 +114,17 @@ def create_work_package_with_time_entry(work_package_params={}, entry_params = { # Test author attribute separately as it is not included in the result set describe CostQuery::Filter::AuthorId do - let!(:non_matching_entry) { FactoryGirl.create(:cost_entry) } - let!(:author) { FactoryGirl.create(:user, member_in_project: project) } - let!(:work_package) { FactoryGirl.create(:work_package, project: project, + let!(:non_matching_entry) { FactoryBot.create(:cost_entry) } + let!(:author) { FactoryBot.create(:user, member_in_project: project) } + let!(:work_package) { FactoryBot.create(:work_package, project: project, author: author) } - let!(:cost_type) { FactoryGirl.create(:cost_type) } - let!(:cost_entry) { FactoryGirl.create(:cost_entry, work_package: work_package, + let!(:cost_type) { FactoryBot.create(:cost_type) } + let!(:cost_entry) { FactoryBot.create(:cost_entry, work_package: work_package, user: user, project: project, cost_type: cost_type) } - let!(:activity) { FactoryGirl.create(:time_entry_activity) } - let!(:time_entry) { FactoryGirl.create(:time_entry, work_package: work_package, + let!(:activity) { FactoryBot.create(:time_entry_activity) } + let!(:time_entry) { FactoryBot.create(:time_entry, work_package: work_package, user: user, project: project, activity: activity) } @@ -178,7 +178,7 @@ def create_work_package_with_time_entry(work_package_params={}, entry_params = { it "filters user_id" do old_user = User.current # create non-matching entry - anonymous = FactoryGirl.create(:anonymous) + anonymous = FactoryBot.create(:anonymous) create_work_package_with_time_entry({}, {user: anonymous}) # create matching entry create_work_package_with_time_entry() @@ -194,7 +194,7 @@ def create_work_packages_and_time_entries(entry_count, work_package_params={}, e end def create_matching_object_with_time_entries(factory, work_package_field, entry_count) - object = FactoryGirl.create(factory) + object = FactoryBot.create(factory) create_work_packages_and_time_entries(entry_count, {work_package_field => object}) object end @@ -205,7 +205,7 @@ def create_matching_object_with_time_entries(factory, work_package_field, entry_ end it "filters status" do - matching_status = FactoryGirl.create(:status, is_closed: true) + matching_status = FactoryBot.create(:status, is_closed: true) create_work_packages_and_time_entries(3, status: matching_status) @query.filter :status_id, operator: 'c' expect(@query.result.count).to eq(3) @@ -237,14 +237,14 @@ def create_matching_object_with_time_entries(factory, work_package_field, entry_ end it "filters category" do - category = FactoryGirl.create(:category, project: project) + category = FactoryBot.create(:category, project: project) create_work_packages_and_time_entries(3, category: category) @query.filter :category_id, operator: '=', value: category.id expect(@query.result.count).to eq(3) end it "filters target version" do - matching_version = FactoryGirl.create(:version, project: project) + matching_version = FactoryBot.create(:version, project: project) create_work_packages_and_time_entries(3, fixed_version: matching_version) @query.filter :fixed_version_id, operator: '=', value: matching_version.id @@ -327,14 +327,14 @@ def create_matching_object_with_time_entries(factory, work_package_field, entry_ describe CostQuery::Filter::CustomFieldEntries do let!(:custom_field) do - cf = FactoryGirl.create(:work_package_custom_field, + cf = FactoryBot.create(:work_package_custom_field, name: 'My custom field') clear_cache cf end let(:custom_field2) do - FactoryGirl.build(:work_package_custom_field, name: 'Database', + FactoryBot.build(:work_package_custom_field, name: 'Database', field_format: "list", possible_values: ['value']) end @@ -412,18 +412,18 @@ def update_work_package_custom_field(name, options) end def create_searchable_fields_and_values - searchable_field = FactoryGirl.create(:work_package_custom_field, + searchable_field = FactoryBot.create(:work_package_custom_field, field_format: "text", name: "Searchable Field") 2.times do work_package = create_work_package_with_entry(:cost_entry) - FactoryGirl.create(:work_package_custom_value, + FactoryBot.create(:work_package_custom_value, custom_field: searchable_field, customized: work_package, value: "125") end work_package = create_work_package_with_entry(:cost_entry) - FactoryGirl.create(:custom_value, + FactoryBot.create(:custom_value, custom_field: searchable_field, value: "non-matching value") clear_cache diff --git a/spec/models/cost_query/group_by_spec.rb b/spec/models/cost_query/group_by_spec.rb index c090f915..70d82dd2 100644 --- a/spec/models/cost_query/group_by_spec.rb +++ b/spec/models/cost_query/group_by_spec.rb @@ -21,33 +21,33 @@ require File.join(File.dirname(__FILE__), '..', '..', 'support', 'custom_field_filter') describe CostQuery, type: :model, reporting_query_helper: true do - let!(:type) { FactoryGirl.create(:type) } - let!(:project1){ FactoryGirl.create(:project_with_types, types: [type]) } - let!(:work_package1) { FactoryGirl.create(:work_package, project: project1, type: type)} - let!(:time_entry1) { FactoryGirl.create(:time_entry, work_package: work_package1, project: project1, spent_on: Date.new(2012, 1, 1)) } + let!(:type) { FactoryBot.create(:type) } + let!(:project1){ FactoryBot.create(:project_with_types, types: [type]) } + let!(:work_package1) { FactoryBot.create(:work_package, project: project1, type: type)} + let!(:time_entry1) { FactoryBot.create(:time_entry, work_package: work_package1, project: project1, spent_on: Date.new(2012, 1, 1)) } let!(:time_entry2) do time_entry2 = time_entry1.dup time_entry2.save! time_entry2 end - let!(:cost_object1) { FactoryGirl.create(:cost_object, project: project1) } - let!(:cost_entry1) { FactoryGirl.create(:cost_entry, work_package: work_package1, project: project1, spent_on: Date.new(2013, 2, 3)) } + let!(:cost_object1) { FactoryBot.create(:cost_object, project: project1) } + let!(:cost_entry1) { FactoryBot.create(:cost_entry, work_package: work_package1, project: project1, spent_on: Date.new(2013, 2, 3)) } let!(:cost_entry2) do cost_entry2 = cost_entry1.dup cost_entry2.save! cost_entry2 end - let!(:project2) { FactoryGirl.create(:project_with_types, types: [type]) } - let!(:work_package2) { FactoryGirl.create(:work_package, project: project2, type: type) } - let!(:time_entry3) { FactoryGirl.create(:time_entry, work_package: work_package2, project: project2, spent_on: Date.new(2013, 2, 3)) } + let!(:project2) { FactoryBot.create(:project_with_types, types: [type]) } + let!(:work_package2) { FactoryBot.create(:work_package, project: project2, type: type) } + let!(:time_entry3) { FactoryBot.create(:time_entry, work_package: work_package2, project: project2, spent_on: Date.new(2013, 2, 3)) } let!(:time_entry4) do time_entry4 = time_entry3.dup time_entry4.save! time_entry4 end - let!(:cost_object2) { FactoryGirl.create(:cost_object, project: project2) } - let!(:cost_entry3) { FactoryGirl.create(:cost_entry, work_package: work_package2, project: project2, spent_on: Date.new(2012, 1, 1)) } + let!(:cost_object2) { FactoryBot.create(:cost_object, project: project2) } + let!(:cost_entry3) { FactoryBot.create(:cost_entry, work_package: work_package2, project: project2, spent_on: Date.new(2012, 1, 1)) } let!(:cost_entry4) do cost_entry4 = cost_entry3.dup cost_entry4.save! @@ -216,13 +216,13 @@ end describe CostQuery::GroupBy::CustomFieldEntries do - let!(:project){ FactoryGirl.create(:project_with_types) } + let!(:project){ FactoryBot.create(:project_with_types) } let!(:custom_field) do - FactoryGirl.create(:work_package_custom_field) + FactoryBot.create(:work_package_custom_field) end let(:custom_field2) do - FactoryGirl.build(:work_package_custom_field) + FactoryBot.build(:work_package_custom_field) end before do diff --git a/spec/models/cost_query/integration_spec.rb b/spec/models/cost_query/integration_spec.rb index adf19f56..5aec3aa6 100644 --- a/spec/models/cost_query/integration_spec.rb +++ b/spec/models/cost_query/integration_spec.rb @@ -22,18 +22,18 @@ describe CostQuery, type: :model, reporting_query_helper: true do minimal_query - 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!(:project1){ FactoryBot.create(:project_with_types) } + let!(:work_package1) { FactoryBot.create(:work_package, project: project1) } + let!(:time_entry1) { FactoryBot.create(:time_entry, work_package: work_package1, project: project1) } + let!(:time_entry2) { FactoryBot.create(:time_entry, work_package: work_package1, project: project1) } - 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) } + let!(:project2) { FactoryBot.create(:project_with_types) } + let!(:work_package2) { FactoryBot.create(:work_package, project: project2) } + let!(:time_entry3) { FactoryBot.create(:time_entry, work_package: work_package2, project: project2) } + let!(:time_entry4) { FactoryBot.create(:time_entry, work_package: work_package2, project: project2) } before do - FactoryGirl.create(:admin) + FactoryBot.create(:admin) end describe "the reporting system" do diff --git a/spec/models/cost_query/operator_spec.rb b/spec/models/cost_query/operator_spec.rb index fa7137a1..67ed3bd4 100644 --- a/spec/models/cost_query/operator_spec.rb +++ b/spec/models/cost_query/operator_spec.rb @@ -22,8 +22,8 @@ describe CostQuery, type: :model, reporting_query_helper: true do minimal_query - let!(:project1) { FactoryGirl.create(:project, name: "project1", created_on: 5.minutes.ago) } - let!(:project2) { FactoryGirl.create(:project, name: "project2", created_on: 6.minutes.ago) } + let!(:project1) { FactoryBot.create(:project, name: "project1", created_on: 5.minutes.ago) } + let!(:project2) { FactoryBot.create(:project, name: "project2", created_on: 6.minutes.ago) } describe CostQuery::Operator do def query(table, field, operator, *values) @@ -41,7 +41,7 @@ def query_on_entries(field, operator, *values) def create_project(options = {}) parent = options.delete :parent - p = FactoryGirl.create(:project, options) + p = FactoryBot.create(:project, options) p.set_parent! parent if parent p end @@ -115,66 +115,66 @@ def create_project(options = {}) #somehow this test doesn't work on sundays n = query('projects', 'created_on', 'w').size day_in_this_week = Time.now.at_beginning_of_week + 1.day - FactoryGirl.create(:project, created_on: day_in_this_week) + FactoryBot.create(:project, created_on: day_in_this_week) expect(query('projects', 'created_on', 'w').size).to eq(n + 1) - FactoryGirl.create(:project, created_on: day_in_this_week + 7.days) - FactoryGirl.create(:project, created_on: day_in_this_week - 7.days) + FactoryBot.create(:project, created_on: day_in_this_week + 7.days) + FactoryBot.create(:project, created_on: day_in_this_week - 7.days) expect(query('projects', 'created_on', 'w').size).to eq(n + 1) end it "does t (today)" do s = query('projects', 'created_on', 't').size - FactoryGirl.create(:project, created_on: Date.yesterday) + FactoryBot.create(:project, created_on: Date.yesterday) expect(query('projects', 'created_on', 't').size).to eq(s) - FactoryGirl.create(:project, created_on: Time.now) + FactoryBot.create(:project, created_on: Time.now) expect(query('projects', 'created_on', 't').size).to eq(s + 1) end it "does t+ (after the day which is n days in the furure)" do n = query('projects', 'created_on', '>t+', 1).size - FactoryGirl.create(:project, created_on: Time.now) + FactoryBot.create(:project, created_on: Time.now) expect(query('projects', 'created_on', '>t+', 1).size).to eq(n) - FactoryGirl.create(:project, created_on: Date.tomorrow + 1) + FactoryBot.create(:project, created_on: Date.tomorrow + 1) expect(query('projects', 'created_on', '>t+', 1).size).to eq(n + 1) end it "does >t- (after the day which is n days ago)" do n = query('projects', 'created_on', '>t-', 1).size - FactoryGirl.create(:project, created_on: Date.today) + FactoryBot.create(:project, created_on: Date.today) expect(query('projects', 'created_on', '>t-', 1).size).to eq(n + 1) - FactoryGirl.create(:project, created_on: Date.yesterday - 1) + FactoryBot.create(:project, created_on: Date.yesterday - 1) expect(query('projects', 'created_on', '>t-', 1).size).to eq(n + 1) end it "does t- (n days ago)" do n = query('projects', 'created_on', 't-', 1).size - FactoryGirl.create(:project, created_on: Date.yesterday) + FactoryBot.create(:project, created_on: Date.yesterday) expect(query('projects', 'created_on', 't-', 1).size).to eq(n + 1) - FactoryGirl.create(:project, created_on: Date.yesterday - 2) + FactoryBot.create(:project, created_on: Date.yesterday - 2) expect(query('projects', 'created_on', 't-', 1).size).to eq(n + 1) end it "does