TheDude
/
openproject
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fully qualify ::Type class constant

Browse Source 
See 0b941955.

Signed-off-by: Alex Coles <alex@alexbcoles.com>
pull/2160/head
Alex Coles 10 years ago
parent e8c1d940e0
commit f75392f8be
5 changed files with 50 additions and 50 deletions
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Show Stats Download Patch File Download Diff File
  1. 6
      app/models/workflow.rb
  2. 4
      features/step_definitions/type_steps.rb
  3. 82
      lib/redmine/default_data/loader.rb
  4. 6
      spec/factories/type_factory.rb
  5. 2
      test/exemplars/type_exemplar.rb

6
app/models/workflow.rb
Unescape View File

@ -68,7 +68,7 @@ class Workflow < ActiveRecord::Base
# Copies workflows from source to targets
def self.copy(source_type, source_role, target_types, target_roles)
unless source_type.is_a?(Type) || source_role.is_a?(Role)
unless source_type.is_a?(::Type) || source_role.is_a?(Role)
raise ArgumentError.new('source_type or source_role must be specified')
end
@ -90,9 +90,9 @@ class Workflow < ActiveRecord::Base
# Copies a single set of workflows from source to target
def self.copy_one(source_type, source_role, target_type, target_role)
unless source_type.is_a?(Type) && !source_type.new_record? &&
unless source_type.is_a?(::Type) && !source_type.new_record? &&
source_role.is_a?(Role) && !source_role.new_record? &&
target_type.is_a?(Type) && !target_type.new_record? &&
target_type.is_a?(::Type) && !target_type.new_record? &&
target_role.is_a?(Role) && !target_role.new_record?
raise ArgumentError.new('arguments can not be nil or unsaved objects')

4
features/step_definitions/type_steps.rb
Unescape View File

@ -29,9 +29,9 @@
# change from symbol to constant once namespace is removed
InstanceFinder.register(Type, Proc.new { |name| ::Type.find_by_name(name) })
InstanceFinder.register(::Type, Proc.new { |name| ::Type.find_by_name(name) })
RouteMap.register(Type, '/types')
RouteMap.register(::Type, '/types')
Given /^the following types are enabled for the project called "(.*?)":$/ do |project_name, type_name_table|
types = type_name_table.raw.flatten.map do |type_name|

82
lib/redmine/default_data/loader.rb
Unescape View File

@ -150,55 +150,55 @@ module Redmine
end).flatten]
# Types
task = Type.create! name: l(:default_type_task),
color_id: colors[:Mint],
is_default: false,
is_in_roadmap: true,
in_aggregation: true,
is_milestone: false,
position: 1
task = ::Type.create! name: l(:default_type_task),
color_id: colors[:Mint],
is_default: false,
is_in_roadmap: true,
in_aggregation: true,
is_milestone: false,
position: 1
deliverable = Type.create! name: l(:default_type_deliverable),
is_default: false,
color_id: colors[:Orange],
is_in_roadmap: true,
deliverable = ::Type.create! name: l(:default_type_deliverable),
is_default: false,
color_id: colors[:Orange],
is_in_roadmap: true,
in_aggregation: true,
is_milestone: false,
position: 2
milestone = ::Type.create! name: l(:default_type_milestone),
is_default: true,
color_id: colors[:Purple],
is_in_roadmap: false,
in_aggregation: true,
is_milestone: false,
position: 2
is_milestone: true,
position: 3
milestone = Type.create! name: l(:default_type_milestone),
is_default: true,
color_id: colors[:Purple],
is_in_roadmap: false,
in_aggregation: true,
is_milestone: true,
position: 3
phase = ::Type.create! name: l(:default_type_phase),
is_default: true,
color_id: colors[:Lime],
is_in_roadmap: false,
in_aggregation: true,
is_milestone: false,
position: 4
phase = Type.create! name: l(:default_type_phase),
is_default: true,
color_id: colors[:Lime],
is_in_roadmap: false,
bug = ::Type.create! name: l(:default_type_bug),
is_default: false,
color_id: colors[:'Red-bright'],
is_in_roadmap: true,
in_aggregation: true,
is_milestone: false,
position: 4
position: 5
bug = Type.create! name: l(:default_type_bug),
is_default: false,
color_id: colors[:'Red-bright'],
is_in_roadmap: true,
in_aggregation: true,
is_milestone: false,
position: 5
feature = Type.create! name: l(:default_type_feature),
is_default: false,
color_id: colors[:Blue],
is_in_roadmap: true,
in_aggregation: true,
is_milestone: false,
position: 6
feature = ::Type.create! name: l(:default_type_feature),
is_default: false,
color_id: colors[:Blue],
is_in_roadmap: true,
in_aggregation: true,
is_milestone: false,
position: 6
none = Type.standard_type
none = ::Type.standard_type
# Issue statuses
new = Status.create!(name: l(:default_status_new), is_closed: false, is_default: true, position: 1)

6
spec/factories/type_factory.rb
Unescape View File

@ -32,13 +32,13 @@ FactoryGirl.define do
name { |a| "Type No. #{a.position}" }
end
factory :type_standard, class: Type do
factory :type_standard, class: ::Type do
name 'None'
is_standard true
is_default true
end
factory :type_bug, class: Type do
factory :type_bug, class: ::Type do
name 'Bug'
position 1
@ -63,7 +63,7 @@ FactoryGirl.define do
end
end
factory :type_with_workflow, class: Type do
factory :type_with_workflow, class: ::Type do
sequence(:name) { |n| "Type #{n}" }
sequence(:position) { |n| n }
callback(:after_build) do |t|

2
test/exemplars/type_exemplar.rb
Unescape View File

@ -27,7 +27,7 @@
# See doc/COPYRIGHT.rdoc for more details.
#++
class Type < ActiveRecord::Base
class ::Type < ActiveRecord::Base
generator_for :name, :method => :next_name
def self.next_name

Write Preview
Loading…
Cancel
Save