aboutsummaryrefslogtreecommitdiffstats
path: root/railties/test
diff options
context:
space:
mode:
authorXavier Noria <fxn@hashref.com>2016-08-06 20:20:22 +0200
committerXavier Noria <fxn@hashref.com>2016-08-06 20:20:22 +0200
commitb326e82dc012d81e9698cb1f402502af1788c1e9 (patch)
tree6b6452129a5b6b684f3d44f21afd2b1bea83fa22 /railties/test
parent80e66cc4d90bf8c15d1a5f6e3152e90147f00772 (diff)
downloadrails-b326e82dc012d81e9698cb1f402502af1788c1e9.tar.gz
rails-b326e82dc012d81e9698cb1f402502af1788c1e9.tar.bz2
rails-b326e82dc012d81e9698cb1f402502af1788c1e9.zip
applies remaining conventions across the project
Diffstat (limited to 'railties/test')
-rw-r--r--railties/test/application/rake/notes_test.rb2
-rw-r--r--railties/test/code_statistics_test.rb1
-rw-r--r--railties/test/commands/dbconsole_test.rb3
-rw-r--r--railties/test/generators/actions_test.rb1
-rw-r--r--railties/test/generators/generators_test_helper.rb1
-rw-r--r--railties/test/initializable_test.rb1
-rw-r--r--railties/test/railties/engine_test.rb1
7 files changed, 1 insertions, 9 deletions
diff --git a/railties/test/application/rake/notes_test.rb b/railties/test/application/rake/notes_test.rb
index b3f379d707..e7ffea2e71 100644
--- a/railties/test/application/rake/notes_test.rb
+++ b/railties/test/application/rake/notes_test.rb
@@ -129,7 +129,7 @@ module ApplicationTests
test "register additional directories" do
app_file "spec/spec_helper.rb", "# TODO: note in spec"
app_file "spec/models/user_spec.rb", "# TODO: note in model spec"
- add_to_config %q{ config.annotations.register_directories("spec") }
+ add_to_config ' config.annotations.register_directories("spec") '
run_rake_notes do |output, lines|
assert_match(/note in spec/, output)
diff --git a/railties/test/code_statistics_test.rb b/railties/test/code_statistics_test.rb
index 2c0db2fd0a..965b6eeb79 100644
--- a/railties/test/code_statistics_test.rb
+++ b/railties/test/code_statistics_test.rb
@@ -29,5 +29,4 @@ class CodeStatisticsTest < ActiveSupport::TestCase
CodeStatistics.new(["hidden file", @tmp_path])
end
end
-
end
diff --git a/railties/test/commands/dbconsole_test.rb b/railties/test/commands/dbconsole_test.rb
index 5304790c92..545460e933 100644
--- a/railties/test/commands/dbconsole_test.rb
+++ b/railties/test/commands/dbconsole_test.rb
@@ -3,8 +3,6 @@ require "minitest/mock"
require "rails/commands/dbconsole"
class Rails::DBConsoleTest < ActiveSupport::TestCase
-
-
def setup
Rails::DBConsole.const_set("APP_PATH", "rails/all")
end
@@ -260,5 +258,4 @@ class Rails::DBConsoleTest < ActiveSupport::TestCase
end
end
end
-
end
diff --git a/railties/test/generators/actions_test.rb b/railties/test/generators/actions_test.rb
index c15eab1df3..9d0d0dc59d 100644
--- a/railties/test/generators/actions_test.rb
+++ b/railties/test/generators/actions_test.rb
@@ -374,5 +374,4 @@ F
def action(*args, &block)
capture(:stdout){ generator.send(*args, &block) }
end
-
end
diff --git a/railties/test/generators/generators_test_helper.rb b/railties/test/generators/generators_test_helper.rb
index 47e8ac5e61..2cdddc8713 100644
--- a/railties/test/generators/generators_test_helper.rb
+++ b/railties/test/generators/generators_test_helper.rb
@@ -46,5 +46,4 @@ module GeneratorsTestHelper
FileUtils.mkdir_p(destination)
FileUtils.cp routes, destination
end
-
end
diff --git a/railties/test/initializable_test.rb b/railties/test/initializable_test.rb
index 34fe395bf7..4b67c91cc5 100644
--- a/railties/test/initializable_test.rb
+++ b/railties/test/initializable_test.rb
@@ -2,7 +2,6 @@ require "abstract_unit"
require "rails/initializable"
module InitializableTests
-
class Foo
include Rails::Initializable
attr_accessor :foo, :bar
diff --git a/railties/test/railties/engine_test.rb b/railties/test/railties/engine_test.rb
index 534761c6a7..d6bd281c53 100644
--- a/railties/test/railties/engine_test.rb
+++ b/railties/test/railties/engine_test.rb
@@ -4,7 +4,6 @@ require "rack/test"
module RailtiesTest
class EngineTest < ActiveSupport::TestCase
-
include ActiveSupport::Testing::Isolation
include Rack::Test::Methods