redmine_extensions 0.2.12 → 0.2.13

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 2a0e67941fae9d601328dfb3131e98082e1b5e88
-  data.tar.gz: 5d488b91d32e196a6a1c550494fa2f96282dab0b
+  metadata.gz: f84dc4261d345f5b0bfc2bea6f7dfef762d7bf31
+  data.tar.gz: c872ccac1093e94cd5e0831279277ce3312b0ad4
 SHA512:
-  metadata.gz: 9be4ff798f2e7d8720b484badfe55cacc50171e36850a5388c0cd922c8c1067b638c0756daa6abb2b60d6c17f329bc22d3d01798bc0c03272dcfa1a74b855510
-  data.tar.gz: 096391ba35d5ebd3663b5113c4c05f643385acb0b0e07a21159e35d455c1ffd6206b3302c312f5e172593a15b4fcd555ce499cc5f64e1fc6dc56c61bddd0be59
+  metadata.gz: c660a03ba12d7ad159f5818d2dbf0d5a9425181e9b24113fc99ce35d997b071801aa74984fb3f2d1b5d37308ce20f25b43ff5563961628566dc874cdfb9a88b9
+  data.tar.gz: 1404b7ee3c6132c4a8e6d147345cda6db61d9e843f52b06d0c696cf6b62ca34905ca65a0e8b6e8bd5a2ce094d571990903db4c8a83ed62daa72f87d8d662b47e

data/lib/generators/redmine_extensions/entity/templates/controller_spec.rb.erb

@@ -1,8 +1,8 @@
 require Rails.root.join('plugins', 'easyproject', 'easy_plugins', 'easy_extensions/test/spec/spec_helper')
 
 describe <%= controller_class %>Controller, logged: true do
-  let(:<%= model_name_underscored %>) { FactoryGirl.create(:<%= model_name_underscored %>) }
-  let(:<%= model_name_pluralize_underscored %>) { FactoryGirl.create_list(:<%= model_name_underscored %>, 5) }
+  let(:<%= model_name_underscored %>) { FactoryBot.create(:<%= model_name_underscored %>) }
+  let(:<%= model_name_pluralize_underscored %>) { FactoryBot.create_list(:<%= model_name_underscored %>, 5) }
 
   before(:each) do
     role = Role.non_member
@@ -40,7 +40,7 @@ describe <%= controller_class %>Controller, logged: true do
   end
 
   it 'create with valid' do
-    post :create, {<%= model_name_underscored %>: FactoryGirl.attributes_for(:<%= model_name_underscored %>)}
+    post :create, {<%= model_name_underscored %>: FactoryBot.attributes_for(:<%= model_name_underscored %>)}
     expect(response).to have_http_status(:success)
     expect(assigns[:<%= model_name_underscored %>]).not_to be_a_new(<%= model_name %>)
     expect(response).to redirect_to(<%= model_name_underscored %>_path(assigns[:<%= model_name_underscored %>]))

data/lib/generators/redmine_extensions/entity/templates/factories.rb.erb

@@ -1,4 +1,4 @@
-FactoryGirl.define do
+FactoryBot.define do
 
   factory :<%= model_name_underscored %> do
       <%- string_columns.each_key do |c| -%>

data/lib/generators/redmine_extensions/plugin/templates/after_init.rb.erb

@@ -18,6 +18,6 @@ end
 # in this block should be used require_dependency, but only if necessary.
 # better is to place a class in file named by rails naming convency and let it be loaded automatically
 # Here goes query registering, custom fields registering and so on
-ActionDispatch::Reloader.to_prepare do
+RedmineExtensions::Reloader.to_prepare do
 
 end

data/lib/redmine_extensions/version.rb

@@ -1,3 +1,3 @@
 module RedmineExtensions
-  VERSION = '0.2.12'
+  VERSION = '0.2.13'
 end

data/spec/factories/easy_queries.rb

@@ -1,4 +1,4 @@
-FactoryGirl.define do
+FactoryBot.define do
   factory :easy_query do
     name 'Test name'
     project nil

data/spec/factories/easy_settings.rb

@@ -1,4 +1,4 @@
-FactoryGirl.define do
+FactoryBot.define do
   factory :easy_setting do
 
     name 'my_setting'

data/spec/factories/issues.rb

@@ -1,4 +1,4 @@
-FactoryGirl.define do
+FactoryBot.define do
 
   factory :enumeration do
     name 'TestEnum'
@@ -41,7 +41,7 @@ FactoryGirl.define do
     start_date { Date.today }
     due_date { Date.today + 7.days }
     status { tracker.default_status }
-    priority { IssuePriority.default || FactoryGirl.create(:issue_priority, :default) }
+    priority { IssuePriority.default || FactoryBot.create(:issue_priority, :default) }
     association :author, :factory => :user, :firstname => "Author"
     association :assigned_to, :factory => :user, :firstname => "Assignee"
 
@@ -65,7 +65,7 @@ FactoryGirl.define do
 
     trait :with_journals do
       after(:create) do |issue|
-        FactoryGirl.create_list(:journal, 2, issue: issue, journalized_type: 'Issue')
+        FactoryBot.create_list(:journal, 2, issue: issue, journalized_type: 'Issue')
       end
     end
 
@@ -75,7 +75,7 @@ FactoryGirl.define do
 
     trait :with_attachment do
       after(:create) do |issue|
-        FactoryGirl.create_list(:attachment, 1, container: issue)
+        FactoryBot.create_list(:attachment, 1, container: issue)
       end
     end
 
@@ -83,7 +83,7 @@ FactoryGirl.define do
 
     after :build do |issue, evaluator|
       if evaluator.factory_is_child
-        issue.parent_issue_id = FactoryGirl.create(:issue, :project => issue.project).id
+        issue.parent_issue_id = FactoryBot.create(:issue, :project => issue.project).id
       end
     end
   end

data/spec/factories/projects.rb

@@ -1,7 +1,7 @@
-FactoryGirl.define do
+FactoryBot.define do
   factory :project do
     transient do
-      number_of_issues 1
+      number_of_issues 0
       number_of_members 0
       number_of_issue_categories 2
       number_of_subprojects 0
@@ -12,24 +12,24 @@ FactoryGirl.define do
     end
     # name 'Test project'
     sequence(:name){ |n| "Project ##{n}" }
-    identifier { name.parameterize }
+    sequence(:identifier){ |n| "#{name.parameterize}#{n}" }
 
     after(:create) do |project, evaluator|
       trackers = Array.wrap(evaluator.trackers)
       trackers = Tracker.all.to_a if trackers.empty?
-      trackers.concat( [FactoryGirl.create(:tracker), FactoryGirl.create(:bug_tracker)] ) if evaluator.create_trackers || trackers.empty?
+      trackers.concat( [FactoryBot.create(:tracker), FactoryBot.create(:bug_tracker)] ) if evaluator.create_trackers || trackers.empty?
       project.trackers = trackers
-      project.time_entry_activities = [FactoryGirl.create(:time_entry_activity)]
+      project.time_entry_activities = [FactoryBot.create(:time_entry_activity)]
     end
     after :create do |project, evaluator|
-      FactoryGirl.create_list :issue, evaluator.number_of_issues, :project => project
-      FactoryGirl.create_list :member, evaluator.number_of_members, :project => project, :roles => [FactoryGirl.create(:role)]
+      FactoryBot.create_list :issue, evaluator.number_of_issues, :project => project
+      FactoryBot.create_list :member, evaluator.number_of_members, :project => project, :roles => [FactoryBot.create(:role)]
       project.enabled_module_names += evaluator.add_modules
     end
 
     after :create do |project, evaluator|
       evaluator.members.each do |user|
-        FactoryGirl.create(:member, project: project, user: user)
+        FactoryBot.create(:member, project: project, user: user)
       end
     end
 
@@ -39,19 +39,19 @@ FactoryGirl.define do
         milestone_options Hash.new
       end
       after :create do |project, evaluator|
-        FactoryGirl.create_list :version, evaluator.number_of_versions, evaluator.milestone_options.merge( :project => project )
+        FactoryBot.create_list :version, evaluator.number_of_versions, evaluator.milestone_options.merge( :project => project )
       end
     end
 
     trait :with_subprojects do
       after :create do |project, evaluator|
-        FactoryGirl.create_list :project, evaluator.number_of_subprojects, :parent => project
+        FactoryBot.create_list :project, evaluator.number_of_subprojects, :parent => project
       end
     end
 
     trait :with_categories do
       after :create do |project, evaluator|
-        FactoryGirl.create_list :issue_category, evaluator.number_of_issue_categories, :project => project
+        FactoryBot.create_list :issue_category, evaluator.number_of_issue_categories, :project => project
       end
     end
   end
@@ -71,7 +71,7 @@ FactoryGirl.define do
     user
 
     after :build do |member, evaluator|
-      member.member_roles << FactoryGirl.build(:member_role, member: member)
+      member.member_roles << FactoryBot.build(:member_role, member: member)
     end
 
     trait :without_roles do

data/spec/factories/time_entries.rb

@@ -1,4 +1,4 @@
-FactoryGirl.define do
+FactoryBot.define do
 
   factory :time_entry_activity, :parent => :enumeration, :class => 'TimeEntryActivity' do
     name 'TestActivity'

data/spec/factories/trackers.rb

@@ -1,9 +1,9 @@
-FactoryGirl.define do
+FactoryBot.define do
 
   factory :tracker do
     sequence(:name) {|n| "Feature ##{n}"}
 
-    default_status { IssueStatus.first || FactoryGirl.create(:issue_status) }
+    default_status { IssueStatus.first || FactoryBot.create(:issue_status) }
 
     trait :bug do
       sequence(:name) {|n| "Bug ##{n}"}

data/spec/factories/users.rb

@@ -1,4 +1,4 @@
-FactoryGirl.define do
+FactoryBot.define do
   factory :user do
     firstname 'John'
     sequence(:lastname) {|n| 'Doe' + n.to_s }

data/spec/models/easy_setting_spec.rb

@@ -2,7 +2,7 @@ require 'rails_helper'
 
 RSpec.describe EasySetting, type: :model do
 
-  let(:project) { FactoryGirl.create(:project, name: 'My project') }
+  let(:project) { FactoryBot.create(:project, name: 'My project') }
   let!(:easy_setting) { EasySetting.create(name: 'my_setting', value: 'my_value', project_id: project.id) }
   let!(:easy_setting_global) { EasySetting.create(name: 'my_setting', value: 'my_value_global') }
 

data/spec/presenters/{redmine_extensions/easy_setting_presenter_spec.rb → easy_settings/params_wrapper_spec.rb}

@@ -1,20 +1,20 @@
 require 'rails_helper'
 
-module RedmineExtensions
-  RSpec.describe EasySettingPresenter, clear_cache: true do
+module EasySettings
+  RSpec.describe ParamsWrapper, clear_cache: true do
 
-    let(:project) { FactoryGirl.create(:project) }
+    let(:project) { FactoryBot.create(:project) }
 
     describe 'saving values' do
       it 'create easy_setting' do
-        presenter = EasySettingPresenter.new({'key' => 'value', 'key2' => 'value2'})
+        presenter = EasySettings::ParamsWrapper.from_params({'key' => 'value', 'key2' => 'value2'})
         expect{ presenter.save }.to change(EasySetting, :count).by(2)
         expect( EasySetting.find_by(name: 'key').value ).to eq('value')
         expect( EasySetting.value('key') ).to eq('value')
       end
 
       it 'create project setting' do
-        presenter = EasySettingPresenter.new({'key' => 'value', 'key2' => 'value2'}, project)
+        presenter = EasySettings::ParamsWrapper.from_params({'key' => 'value', 'key2' => 'value2'}, project: project)
         expect{ presenter.save }.to change(EasySetting, :count).by(2)
         expect( EasySetting.where(project_id: project.id).count ).to eq(2)
         expect( EasySetting.value('key') ).to eq(nil)
@@ -22,8 +22,8 @@ module RedmineExtensions
       end
 
       it 'format value' do
-        presenter = EasySettingPresenter.new({'key' => '1', 'key2' => '0'})
-        expect(presenter).to receive(:boolean_keys).at_least(:once).and_return([:key, :key2])
+        EasySetting.map.boolean_keys(:key, :key2)
+        presenter = EasySettings::ParamsWrapper.from_params({'key' => '1', 'key2' => '0'})
         presenter.save
         expect(EasySetting.value('key')).to be true
         expect(EasySetting.value('key2')).to be false

data/spec/rails_helper.rb

@@ -5,7 +5,7 @@ require 'spec_helper'
 require File.expand_path("../redmine/config/environment.rb",  __FILE__)
 # Add additional requires below this line. Rails is not loaded until this point!
 require 'rspec/rails'
-require 'factory_girl_rails'
+require 'factory_bot_rails'
 require 'database_cleaner'
 
   Rails.backtrace_cleaner.remove_silencers!
@@ -63,7 +63,13 @@ Capybara.register_driver :poltergeist do |app|
 end
 
 Capybara.register_driver :chrome do |app|
-  Capybara::Selenium::Driver.new(app, :browser => :chrome)
+  capabilities = Selenium::WebDriver::Remote::Capabilities.chrome(
+    'chromeOptions' => {
+      'args' => ENV['CHROME_OPTIONS'].to_s.split(' ')
+    }
+  )
+
+  Capybara::Selenium::Driver.new(app, browser: :chrome, desired_capabilities: capabilities)
 end
 
 Capybara.javascript_driver = ENV['JS_DRIVER'].present? ? ENV['JS_DRIVER'].downcase.to_sym : :poltergeist

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: redmine_extensions
 version: !ruby/object:Gem::Version
-  version: 0.2.12
+  version: 0.2.13
 platform: ruby
 authors:
 - Easy Software Ltd
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-05-29 00:00:00.000000000 Z
+date: 2018-07-27 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -84,16 +84,16 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '2.6'
+        version: 3.3.1
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '2.6'
+        version: 3.3.1
 - !ruby/object:Gem::Dependency
-  name: factory_girl_rails
+  name: factory_bot_rails
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
@@ -280,7 +280,7 @@ files:
 - spec/factories/users.rb
 - spec/features/autocomplete_spec.rb
 - spec/models/easy_setting_spec.rb
-- spec/presenters/redmine_extensions/easy_setting_presenter_spec.rb
+- spec/presenters/easy_settings/params_wrapper_spec.rb
 - spec/rails_helper.rb
 - spec/spec_helper.rb
 - spec/support/plugin_generator.rb
@@ -319,7 +319,7 @@ test_files:
 - spec/factories/users.rb
 - spec/features/autocomplete_spec.rb
 - spec/models/easy_setting_spec.rb
-- spec/presenters/redmine_extensions/easy_setting_presenter_spec.rb
+- spec/presenters/easy_settings/params_wrapper_spec.rb
 - spec/rails_helper.rb
 - spec/spec_helper.rb
 - spec/support/plugin_generator.rb