Merge pull request #127 from finnlabs/housekeeping/bump-factory-girl

FactoryGirl => FactoryBot (opf/openproject#6304)
opf · May 8, 2018 · 9ae06ac · 9ae06ac
2 parents 65ee055 + eef303c
commit 9ae06ac
Show file tree

Hide file tree

Showing 24 changed files with 160 additions and 160 deletions.
diff --git 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
@@ -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
@@ -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
@@ -1,32 +1,32 @@
 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,
                        project: project,
                        hours: 10
   }
   let!(:time_entry2) {
-    FactoryGirl.create :time_entry,
+    FactoryBot.create :time_entry,
                        spent_on: 18.months.ago,
                        user: user,
                        work_package: work_package,
                        project: project,
                        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
@@ -20,27 +20,27 @@
 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,
                        hours: 10
   }
 
   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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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