From 800221ed90f23021f7c8e047357aa5efef765555 Mon Sep 17 00:00:00 2001 From: Alexey Dubovskoy Date: Tue, 21 Jun 2016 09:34:52 +0100 Subject: [PATCH] re: RuboCop - replace rocket style hashes --- .rubocop.yml | 2 +- .../key_transform_test.rb | 12 ++++++------ test/adapter/json/transform_test.rb | 2 +- test/adapter/json_api/linked_test.rb | 2 +- test/adapter/json_api/links_test.rb | 4 ++-- test/adapter/json_api/resource_meta_test.rb | 6 +++--- test/adapter/json_api/transform_test.rb | 16 ++++++++-------- 7 files changed, 22 insertions(+), 22 deletions(-) diff --git a/.rubocop.yml b/.rubocop.yml index aa592087..8d7551a5 100644 --- a/.rubocop.yml +++ b/.rubocop.yml @@ -1,5 +1,5 @@ AllCops: - TargetRubyVersion: 2.2 + TargetRubyVersion: 2.1 Exclude: - config/initializers/forbidden_yaml.rb - !ruby/regexp /(vendor|bundle|bin|db|tmp)\/.*/ diff --git a/test/active_model_serializers/key_transform_test.rb b/test/active_model_serializers/key_transform_test.rb index 57349143..c25f6ca4 100644 --- a/test/active_model_serializers/key_transform_test.rb +++ b/test/active_model_serializers/key_transform_test.rb @@ -6,7 +6,7 @@ module ActiveModelSerializers obj = Object.new scenarios = [ { - value: { "some-key": 'value' }, + value: { :"some-key" => 'value' }, expected: { SomeKey: 'value' } }, { @@ -72,7 +72,7 @@ module ActiveModelSerializers obj = Object.new scenarios = [ { - value: { "some-key": 'value' }, + value: { :"some-key" => 'value' }, expected: { someKey: 'value' } }, { @@ -139,7 +139,7 @@ module ActiveModelSerializers scenarios = [ { value: { some_key: 'value' }, - expected: { "some-key": 'value' } + expected: { :"some-key" => 'value' } }, { value: { 'some_key' => 'value' }, @@ -147,7 +147,7 @@ module ActiveModelSerializers }, { value: { SomeKey: 'value' }, - expected: { "some-key": 'value' } + expected: { :"some-key" => 'value' } }, { value: { 'SomeKey' => 'value' }, @@ -155,7 +155,7 @@ module ActiveModelSerializers }, { value: { someKey: 'value' }, - expected: { "some-key": 'value' } + expected: { :"some-key" => 'value' } }, { value: { 'someKey' => 'value' }, @@ -200,7 +200,7 @@ module ActiveModelSerializers obj = Object.new scenarios = [ { - value: { "some-key": 'value' }, + value: { :"some-key" => 'value' }, expected: { some_key: 'value' } }, { diff --git a/test/adapter/json/transform_test.rb b/test/adapter/json/transform_test.rb index e99c77a3..acef81f9 100644 --- a/test/adapter/json/transform_test.rb +++ b/test/adapter/json/transform_test.rb @@ -63,7 +63,7 @@ module ActiveModelSerializers def test_transform_dash mock_request(:dash) assert_equal({ - blog: { id: 1, "special-attribute": 'neat', articles: nil } + blog: { id: 1, :"special-attribute" => 'neat', articles: nil } }, @adapter.serializable_hash) end diff --git a/test/adapter/json_api/linked_test.rb b/test/adapter/json_api/linked_test.rb index 876548e5..98882fe8 100644 --- a/test/adapter/json_api/linked_test.rb +++ b/test/adapter/json_api/linked_test.rb @@ -370,7 +370,7 @@ module ActiveModelSerializers expected = [ type: 'nested-posts', id: '2', relationships: { - "nested-posts": { + :"nested-posts" => { data: [ { type: 'nested-posts', id: '1' }, { type: 'nested-posts', id: '2' } diff --git a/test/adapter/json_api/links_test.rb b/test/adapter/json_api/links_test.rb index 3d22a36a..6be6ead6 100644 --- a/test/adapter/json_api/links_test.rb +++ b/test/adapter/json_api/links_test.rb @@ -82,10 +82,10 @@ module ActiveModelSerializers } }, author: 'http://example.com/link_authors/1337', - "link-authors": 'http://example.com/link_authors', + :"link-authors" => 'http://example.com/link_authors', resource: 'http://example.com/resource', posts: 'http://example.com/link_authors/1337/posts', - "yet-another": 'http://example.com/resource/1337' + :"yet-another" => 'http://example.com/resource/1337' } assert_equal(expected, hash[:data][:links]) end diff --git a/test/adapter/json_api/resource_meta_test.rb b/test/adapter/json_api/resource_meta_test.rb index 147309ae..fa281f30 100644 --- a/test/adapter/json_api/resource_meta_test.rb +++ b/test/adapter/json_api/resource_meta_test.rb @@ -54,7 +54,7 @@ module ActiveModel adapter: :json_api ).serializable_hash expected = { - "comments-count": @post.comments.count + :"comments-count" => @post.comments.count } assert_equal(expected, hash[:data][:meta]) end @@ -69,8 +69,8 @@ module ActiveModel ).serializable_hash expected = { data: [ - { id: '1337', type: 'posts', meta: { "comments-count": 0 } }, - { id: '1339', type: 'posts', meta: { "comments-count": 1 } } + { id: '1337', type: 'posts', meta: { :"comments-count" => 0 } }, + { id: '1339', type: 'posts', meta: { :"comments-count" => 1 } } ] } assert_equal(expected, hash) diff --git a/test/adapter/json_api/transform_test.rb b/test/adapter/json_api/transform_test.rb index 3b6e6849..a75f0b46 100644 --- a/test/adapter/json_api/transform_test.rb +++ b/test/adapter/json_api/transform_test.rb @@ -76,7 +76,7 @@ module ActiveModelSerializers attributes: { title: 'Title 1', body: 'Body 1', - "publish-at": @publish_at + :"publish-at" => @publish_at }, relationships: { author: { @@ -91,10 +91,10 @@ module ActiveModelSerializers }, links: { self: 'http://example.com/posts/1337', - "post-authors": 'http://example.com/posts/1337/authors', - "subscriber-comments": 'http://example.com/posts/1337/comments' + :"post-authors" => 'http://example.com/posts/1337/authors', + :"subscriber-comments" => 'http://example.com/posts/1337/comments' }, - meta: { rating: 5, "favorite-count": 10 } + meta: { rating: 5, :"favorite-count" => 10 } } }, result) end @@ -185,7 +185,7 @@ module ActiveModelSerializers attributes: { title: 'Title 1', body: 'Body 1', - "publish-at": @publish_at + :"publish-at" => @publish_at }, relationships: { author: { @@ -200,10 +200,10 @@ module ActiveModelSerializers }, links: { self: 'http://example.com/posts/1337', - "post-authors": 'http://example.com/posts/1337/authors', - "subscriber-comments": 'http://example.com/posts/1337/comments' + :"post-authors" => 'http://example.com/posts/1337/authors', + :"subscriber-comments" => 'http://example.com/posts/1337/comments' }, - meta: { rating: 5, "favorite-count": 10 } + meta: { rating: 5, :"favorite-count" => 10 } } }, result) end