cst1/openstreetmap-website
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Fix new rubocop warnings

Browse source
This commit is contained in:
Tom Hughes 2018-10-31 18:49:21 +00:00
parent 00f82918e6
commit 6142980d07
4 changed files with 48 additions and 48 deletions
Download patch file Download diff file Expand all files Collapse all files

20
lib/classic_pagination/pagination.rb
View file

@ -67,17 +67,17 @@ module ActionController
DEFAULT_OPTIONS = { DEFAULT_OPTIONS = {
:class_name => nil, :class_name => nil,
:singular_name => nil, :singular_name => nil,
:per_page => 10, :per_page => 10,
:conditions => nil, :conditions => nil,
:order_by => nil, :order_by => nil,
:order => nil, :order => nil,
:join => nil, :join => nil,
:joins => nil, :joins => nil,
:count => nil, :count => nil,
:include => nil, :include => nil,
:select => nil, :select => nil,
:group => nil, :group => nil,
:parameter => "page" :parameter => "page"
}.freeze }.freeze
end end

4
lib/diff_reader.rb
View file

@ -8,8 +8,8 @@ class DiffReader
# maps each element type to the model class which handles it # maps each element type to the model class which handles it
MODELS = { MODELS = {
"node" => Node, "node" => Node,
"way" => Way, "way" => Way,
"relation" => Relation "relation" => Relation
}.freeze }.freeze

68
lib/tasks/auto_annotate_models.rake
View file

@ -6,41 +6,41 @@ if Rails.env.development?
# You can override any of these by setting an environment variable of the # You can override any of these by setting an environment variable of the
# same name. # same name.
Annotate.set_defaults( Annotate.set_defaults(
"routes" => "false", "routes" => "false",
"position_in_routes" => "before", "position_in_routes" => "before",
"position_in_class" => "before", "position_in_class" => "before",
"position_in_test" => "before", "position_in_test" => "before",
"position_in_fixture" => "before", "position_in_fixture" => "before",
"position_in_factory" => "before", "position_in_factory" => "before",
"position_in_serializer" => "before", "position_in_serializer" => "before",
"show_foreign_keys" => "true", "show_foreign_keys" => "true",
"show_indexes" => "true", "show_indexes" => "true",
"simple_indexes" => "false", "simple_indexes" => "false",
"model_dir" => "app/models", "model_dir" => "app/models",
"root_dir" => "", "root_dir" => "",
"include_version" => "false", "include_version" => "false",
"require" => "", "require" => "",
"exclude_tests" => "true", "exclude_tests" => "true",
"exclude_fixtures" => "true", "exclude_fixtures" => "true",
"exclude_factories" => "true", "exclude_factories" => "true",
"exclude_serializers" => "true", "exclude_serializers" => "true",
"exclude_scaffolds" => "true", "exclude_scaffolds" => "true",
"exclude_controllers" => "true", "exclude_controllers" => "true",
"exclude_helpers" => "true", "exclude_helpers" => "true",
"ignore_model_sub_dir" => "false", "ignore_model_sub_dir" => "false",
"ignore_columns" => nil, "ignore_columns" => nil,
"ignore_routes" => nil, "ignore_routes" => nil,
"ignore_unknown_models" => "false", "ignore_unknown_models" => "false",
"hide_limit_column_types" => "integer,boolean", "hide_limit_column_types" => "integer,boolean",
"skip_on_db_migrate" => "false", "skip_on_db_migrate" => "false",
"format_bare" => "true", "format_bare" => "true",
"format_rdoc" => "false", "format_rdoc" => "false",
"format_markdown" => "false", "format_markdown" => "false",
"sort" => "false", "sort" => "false",
"force" => "false", "force" => "false",
"trace" => "false", "trace" => "false",
"wrapper_open" => nil, "wrapper_open" => nil,
"wrapper_close" => nil "wrapper_close" => nil
) )
end end

4
test/controllers/amf_controller_test.rb
View file

@ -360,11 +360,11 @@ class AmfControllerTest < ActionController::TestCase
# into the method args. # into the method args.
def test_getway_old_invalid def test_getway_old_invalid
way_id = create(:way, :with_history, :version => 2).id way_id = create(:way, :with_history, :version => 2).id
{ "foo" => "bar", { "foo" => "bar",
way_id => "not a date", way_id => "not a date",
way_id => "2009-03-25 00:00:00", # <- wrong format way_id => "2009-03-25 00:00:00", # <- wrong format
way_id => "0 Jan 2009 00:00:00", # <- invalid date way_id => "0 Jan 2009 00:00:00", # <- invalid date
-1 => "1 Jan 2009 00:00:00" }.each do |id, t| # <- invalid -1 => "1 Jan 2009 00:00:00" }.each do |id, t| # <- invalid
amf_content "getway_old", "/1", [id, t] amf_content "getway_old", "/1", [id, t]
post :amf_read post :amf_read
assert_response :success assert_response :success