diff options
| author | Matthew Draper <matthew@trebex.net> | 2017-06-15 02:45:38 +0930 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-06-15 02:45:38 +0930 |
| commit | 4915bfeeea88889341153cad9166090c2d6b1910 (patch) | |
| tree | 926d5c944b8fd71c1fa2db6ddbc5fc397722112e /actioncable | |
| parent | 326914dd3a15e04851c9ef4a47edeb3dad2ec381 (diff) | |
| parent | 6673cf7071094e87d473459452a2d0e4c2ccfebe (diff) | |
| download | rails-4915bfeeea88889341153cad9166090c2d6b1910.tar.gz rails-4915bfeeea88889341153cad9166090c2d6b1910.tar.bz2 rails-4915bfeeea88889341153cad9166090c2d6b1910.zip | |
Merge pull request #29417 from bogdanvlviv/use-require_relative-instead-of_require-with-full-path
Use `require_relative` instead of `require` with full path
Diffstat (limited to 'actioncable')
| -rw-r--r-- | actioncable/README.md | 2 | ||||
| -rwxr-xr-x | actioncable/bin/test | 2 | ||||
| -rw-r--r-- | actioncable/test/subscription_adapter/async_test.rb | 2 | ||||
| -rw-r--r-- | actioncable/test/subscription_adapter/evented_redis_test.rb | 4 | ||||
| -rw-r--r-- | actioncable/test/subscription_adapter/inline_test.rb | 2 | ||||
| -rw-r--r-- | actioncable/test/subscription_adapter/postgresql_test.rb | 2 | ||||
| -rw-r--r-- | actioncable/test/subscription_adapter/redis_test.rb | 4 |
7 files changed, 9 insertions, 9 deletions
diff --git a/actioncable/README.md b/actioncable/README.md index d14f20d75b..6946dbefb0 100644 --- a/actioncable/README.md +++ b/actioncable/README.md @@ -409,7 +409,7 @@ application. The recommended basic setup is as follows: ```ruby # cable/config.ru -require ::File.expand_path('../config/environment', __dir__) +require_relative '../config/environment' Rails.application.eager_load! run ActionCable.server diff --git a/actioncable/bin/test b/actioncable/bin/test index a7beb14b27..470ce93f10 100755 --- a/actioncable/bin/test +++ b/actioncable/bin/test @@ -1,4 +1,4 @@ #!/usr/bin/env ruby COMPONENT_ROOT = File.expand_path("..", __dir__) -require File.expand_path("../tools/test", COMPONENT_ROOT) +require_relative "../../tools/test" diff --git a/actioncable/test/subscription_adapter/async_test.rb b/actioncable/test/subscription_adapter/async_test.rb index 7bc2e55d40..8a447c7a4f 100644 --- a/actioncable/test/subscription_adapter/async_test.rb +++ b/actioncable/test/subscription_adapter/async_test.rb @@ -1,5 +1,5 @@ require "test_helper" -require_relative "./common" +require_relative "common" class AsyncAdapterTest < ActionCable::TestCase include CommonSubscriptionAdapterTest diff --git a/actioncable/test/subscription_adapter/evented_redis_test.rb b/actioncable/test/subscription_adapter/evented_redis_test.rb index 256458bc24..5453511549 100644 --- a/actioncable/test/subscription_adapter/evented_redis_test.rb +++ b/actioncable/test/subscription_adapter/evented_redis_test.rb @@ -1,6 +1,6 @@ require "test_helper" -require_relative "./common" -require_relative "./channel_prefix" +require_relative "common" +require_relative "channel_prefix" class EventedRedisAdapterTest < ActionCable::TestCase include CommonSubscriptionAdapterTest diff --git a/actioncable/test/subscription_adapter/inline_test.rb b/actioncable/test/subscription_adapter/inline_test.rb index 52bfa00aba..eafa3df2df 100644 --- a/actioncable/test/subscription_adapter/inline_test.rb +++ b/actioncable/test/subscription_adapter/inline_test.rb @@ -1,5 +1,5 @@ require "test_helper" -require_relative "./common" +require_relative "common" class InlineAdapterTest < ActionCable::TestCase include CommonSubscriptionAdapterTest diff --git a/actioncable/test/subscription_adapter/postgresql_test.rb b/actioncable/test/subscription_adapter/postgresql_test.rb index beb6efab28..ada4c2e2bd 100644 --- a/actioncable/test/subscription_adapter/postgresql_test.rb +++ b/actioncable/test/subscription_adapter/postgresql_test.rb @@ -1,5 +1,5 @@ require "test_helper" -require_relative "./common" +require_relative "common" require "active_record" diff --git a/actioncable/test/subscription_adapter/redis_test.rb b/actioncable/test/subscription_adapter/redis_test.rb index 4df5e0cbcd..11120b3f85 100644 --- a/actioncable/test/subscription_adapter/redis_test.rb +++ b/actioncable/test/subscription_adapter/redis_test.rb @@ -1,6 +1,6 @@ require "test_helper" -require_relative "./common" -require_relative "./channel_prefix" +require_relative "common" +require_relative "channel_prefix" class RedisAdapterTest < ActionCable::TestCase include CommonSubscriptionAdapterTest |