From 319106d09c0ec2daf8b5345f525f1c97b6368ce2 Mon Sep 17 00:00:00 2001 From: Matthew Rudy Jacobs Date: Sun, 22 Feb 2009 19:23:04 +0000 Subject: Metal can now line in plugins under app/metal [#2045 state:committed] Signed-off-by: David Heinemeier Hansson --- .../fixtures/plugins/engines/engine/app/metal/engine_metal.rb | 10 ++++++++++ 1 file changed, 10 insertions(+) create mode 100644 railties/test/fixtures/plugins/engines/engine/app/metal/engine_metal.rb (limited to 'railties/test/fixtures') diff --git a/railties/test/fixtures/plugins/engines/engine/app/metal/engine_metal.rb b/railties/test/fixtures/plugins/engines/engine/app/metal/engine_metal.rb new file mode 100644 index 0000000000..d67a127ca7 --- /dev/null +++ b/railties/test/fixtures/plugins/engines/engine/app/metal/engine_metal.rb @@ -0,0 +1,10 @@ +class EngineMetal + def self.call(env) + if env["PATH_INFO"] =~ /^\/metal/ + [200, {"Content-Type" => "text/html"}, ["Engine metal"]] + else + [404, {"Content-Type" => "text/html"}, ["Not Found"]] + end + end +end + -- cgit v1.2.3 From 4d4d2c3896ed5a5d74da833c5c3132f406f4eab7 Mon Sep 17 00:00:00 2001 From: Simon Jefford Date: Tue, 3 Mar 2009 12:39:19 -0600 Subject: Enhanced Rails Metal - the load order of metals can now be configured [#2057 state:resolved] Signed-off-by: Joshua Peek --- railties/test/fixtures/metal/multiplemetals/app/metal/metal_a.rb | 5 +++++ railties/test/fixtures/metal/multiplemetals/app/metal/metal_b.rb | 5 +++++ railties/test/fixtures/metal/singlemetal/app/metal/foo_metal.rb | 5 +++++ .../test/fixtures/metal/subfolders/app/metal/Folder/metal_a.rb | 7 +++++++ .../test/fixtures/metal/subfolders/app/metal/Folder/metal_b.rb | 7 +++++++ 5 files changed, 29 insertions(+) create mode 100644 railties/test/fixtures/metal/multiplemetals/app/metal/metal_a.rb create mode 100644 railties/test/fixtures/metal/multiplemetals/app/metal/metal_b.rb create mode 100644 railties/test/fixtures/metal/singlemetal/app/metal/foo_metal.rb create mode 100644 railties/test/fixtures/metal/subfolders/app/metal/Folder/metal_a.rb create mode 100644 railties/test/fixtures/metal/subfolders/app/metal/Folder/metal_b.rb (limited to 'railties/test/fixtures') diff --git a/railties/test/fixtures/metal/multiplemetals/app/metal/metal_a.rb b/railties/test/fixtures/metal/multiplemetals/app/metal/metal_a.rb new file mode 100644 index 0000000000..b8e7001351 --- /dev/null +++ b/railties/test/fixtures/metal/multiplemetals/app/metal/metal_a.rb @@ -0,0 +1,5 @@ +class MetalA < Rails::Rack::Metal + def self.call(env) + [200, { "Content-Type" => "text/html"}, "Hi"] + end +end diff --git a/railties/test/fixtures/metal/multiplemetals/app/metal/metal_b.rb b/railties/test/fixtures/metal/multiplemetals/app/metal/metal_b.rb new file mode 100644 index 0000000000..adc2f45fcf --- /dev/null +++ b/railties/test/fixtures/metal/multiplemetals/app/metal/metal_b.rb @@ -0,0 +1,5 @@ +class MetalB < Rails::Rack::Metal + def self.call(env) + [200, { "Content-Type" => "text/html"}, "Hi"] + end +end diff --git a/railties/test/fixtures/metal/singlemetal/app/metal/foo_metal.rb b/railties/test/fixtures/metal/singlemetal/app/metal/foo_metal.rb new file mode 100644 index 0000000000..9ade2ce8e7 --- /dev/null +++ b/railties/test/fixtures/metal/singlemetal/app/metal/foo_metal.rb @@ -0,0 +1,5 @@ +class FooMetal < Rails::Rack::Metal + def self.call(env) + [200, { "Content-Type" => "text/html"}, "Hi"] + end +end diff --git a/railties/test/fixtures/metal/subfolders/app/metal/Folder/metal_a.rb b/railties/test/fixtures/metal/subfolders/app/metal/Folder/metal_a.rb new file mode 100644 index 0000000000..71a5a62eb8 --- /dev/null +++ b/railties/test/fixtures/metal/subfolders/app/metal/Folder/metal_a.rb @@ -0,0 +1,7 @@ +module Folder + class MetalA < Rails::Rack::Metal + def self.call(env) + [200, { "Content-Type" => "text/html"}, "Hi"] + end + end +end diff --git a/railties/test/fixtures/metal/subfolders/app/metal/Folder/metal_b.rb b/railties/test/fixtures/metal/subfolders/app/metal/Folder/metal_b.rb new file mode 100644 index 0000000000..430d7bfed6 --- /dev/null +++ b/railties/test/fixtures/metal/subfolders/app/metal/Folder/metal_b.rb @@ -0,0 +1,7 @@ +module Folder + class MetalB < Rails::Rack::Metal + def self.call(env) + [200, { "Content-Type" => "text/html"}, "Hi"] + end + end +end -- cgit v1.2.3 From 4185fb1e58d8142162c3a39f9302559688dd431b Mon Sep 17 00:00:00 2001 From: karmi Date: Sat, 7 Mar 2009 16:02:52 +0000 Subject: Raise LoadError instead of a runtime exception [#1498 state:resolved] Signed-off-by: Pratik Naik --- railties/test/fixtures/plugins/engines/engine/init.rb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'railties/test/fixtures') diff --git a/railties/test/fixtures/plugins/engines/engine/init.rb b/railties/test/fixtures/plugins/engines/engine/init.rb index f4b00c0fa4..64e9ae6c30 100644 --- a/railties/test/fixtures/plugins/engines/engine/init.rb +++ b/railties/test/fixtures/plugins/engines/engine/init.rb @@ -1,3 +1,3 @@ # My app/models dir must be in the load path. require 'engine_model' -raise 'missing model from my app/models dir' unless defined?(EngineModel) +raise LoadError, 'missing model from my app/models dir' unless defined?(EngineModel) -- cgit v1.2.3 From e8b07dc340441d4d15889cb14ee9f0f00a1ecd30 Mon Sep 17 00:00:00 2001 From: Joshua Peek Date: Tue, 10 Mar 2009 11:19:32 -0500 Subject: Ensure public folder structure is setup correctly if the tests are ran out of order, fixes tests in 0c9bbf8 --- railties/test/fixtures/public/foo/bar.html | 1 + railties/test/fixtures/public/foo/index.html | 1 + railties/test/fixtures/public/index.html | 1 + 3 files changed, 3 insertions(+) create mode 100644 railties/test/fixtures/public/foo/bar.html create mode 100644 railties/test/fixtures/public/foo/index.html create mode 100644 railties/test/fixtures/public/index.html (limited to 'railties/test/fixtures') diff --git a/railties/test/fixtures/public/foo/bar.html b/railties/test/fixtures/public/foo/bar.html new file mode 100644 index 0000000000..9a35646205 --- /dev/null +++ b/railties/test/fixtures/public/foo/bar.html @@ -0,0 +1 @@ +/foo/bar.html \ No newline at end of file diff --git a/railties/test/fixtures/public/foo/index.html b/railties/test/fixtures/public/foo/index.html new file mode 100644 index 0000000000..497a2e898f --- /dev/null +++ b/railties/test/fixtures/public/foo/index.html @@ -0,0 +1 @@ +/foo/index.html \ No newline at end of file diff --git a/railties/test/fixtures/public/index.html b/railties/test/fixtures/public/index.html new file mode 100644 index 0000000000..525950ba6b --- /dev/null +++ b/railties/test/fixtures/public/index.html @@ -0,0 +1 @@ +/index.html \ No newline at end of file -- cgit v1.2.3 From 5f10533949457e3797c8f0b51eb30a9268bceb4d Mon Sep 17 00:00:00 2001 From: Luca Guidi Date: Sun, 15 Mar 2009 18:41:21 -0500 Subject: Make sure Metal use ActionController class name conventions [#2242 state:resolved] Signed-off-by: Joshua Peek --- railties/test/fixtures/metal/pluralmetal/app/metal/legacy_routes.rb | 5 +++++ 1 file changed, 5 insertions(+) create mode 100644 railties/test/fixtures/metal/pluralmetal/app/metal/legacy_routes.rb (limited to 'railties/test/fixtures') diff --git a/railties/test/fixtures/metal/pluralmetal/app/metal/legacy_routes.rb b/railties/test/fixtures/metal/pluralmetal/app/metal/legacy_routes.rb new file mode 100644 index 0000000000..6f9e382500 --- /dev/null +++ b/railties/test/fixtures/metal/pluralmetal/app/metal/legacy_routes.rb @@ -0,0 +1,5 @@ +class LegacyRoutes < Rails::Rack::Metal + def self.call(env) + [301, { "Location" => "http://example.com"}, nil] + end +end -- cgit v1.2.3 From 5a575bb99293837533dc357da891dac29a702616 Mon Sep 17 00:00:00 2001 From: Joshua Peek Date: Sun, 15 Mar 2009 23:21:29 -0500 Subject: update metal fixtures to be ruby 1.9 compat --- railties/test/fixtures/metal/multiplemetals/app/metal/metal_a.rb | 2 +- railties/test/fixtures/metal/multiplemetals/app/metal/metal_b.rb | 2 +- railties/test/fixtures/metal/pluralmetal/app/metal/legacy_routes.rb | 2 +- railties/test/fixtures/metal/singlemetal/app/metal/foo_metal.rb | 2 +- railties/test/fixtures/metal/subfolders/app/metal/Folder/metal_a.rb | 2 +- railties/test/fixtures/metal/subfolders/app/metal/Folder/metal_b.rb | 2 +- 6 files changed, 6 insertions(+), 6 deletions(-) (limited to 'railties/test/fixtures') diff --git a/railties/test/fixtures/metal/multiplemetals/app/metal/metal_a.rb b/railties/test/fixtures/metal/multiplemetals/app/metal/metal_a.rb index b8e7001351..2d373ce422 100644 --- a/railties/test/fixtures/metal/multiplemetals/app/metal/metal_a.rb +++ b/railties/test/fixtures/metal/multiplemetals/app/metal/metal_a.rb @@ -1,5 +1,5 @@ class MetalA < Rails::Rack::Metal def self.call(env) - [200, { "Content-Type" => "text/html"}, "Hi"] + [200, { "Content-Type" => "text/html"}, ["Hi"]] end end diff --git a/railties/test/fixtures/metal/multiplemetals/app/metal/metal_b.rb b/railties/test/fixtures/metal/multiplemetals/app/metal/metal_b.rb index adc2f45fcf..a8bbf3fd60 100644 --- a/railties/test/fixtures/metal/multiplemetals/app/metal/metal_b.rb +++ b/railties/test/fixtures/metal/multiplemetals/app/metal/metal_b.rb @@ -1,5 +1,5 @@ class MetalB < Rails::Rack::Metal def self.call(env) - [200, { "Content-Type" => "text/html"}, "Hi"] + [200, { "Content-Type" => "text/html"}, ["Hi"]] end end diff --git a/railties/test/fixtures/metal/pluralmetal/app/metal/legacy_routes.rb b/railties/test/fixtures/metal/pluralmetal/app/metal/legacy_routes.rb index 6f9e382500..0cd3737c32 100644 --- a/railties/test/fixtures/metal/pluralmetal/app/metal/legacy_routes.rb +++ b/railties/test/fixtures/metal/pluralmetal/app/metal/legacy_routes.rb @@ -1,5 +1,5 @@ class LegacyRoutes < Rails::Rack::Metal def self.call(env) - [301, { "Location" => "http://example.com"}, nil] + [301, { "Location" => "http://example.com"}, []] end end diff --git a/railties/test/fixtures/metal/singlemetal/app/metal/foo_metal.rb b/railties/test/fixtures/metal/singlemetal/app/metal/foo_metal.rb index 9ade2ce8e7..5f5b087592 100644 --- a/railties/test/fixtures/metal/singlemetal/app/metal/foo_metal.rb +++ b/railties/test/fixtures/metal/singlemetal/app/metal/foo_metal.rb @@ -1,5 +1,5 @@ class FooMetal < Rails::Rack::Metal def self.call(env) - [200, { "Content-Type" => "text/html"}, "Hi"] + [200, { "Content-Type" => "text/html"}, ["Hi"]] end end diff --git a/railties/test/fixtures/metal/subfolders/app/metal/Folder/metal_a.rb b/railties/test/fixtures/metal/subfolders/app/metal/Folder/metal_a.rb index 71a5a62eb8..25b3bb0abc 100644 --- a/railties/test/fixtures/metal/subfolders/app/metal/Folder/metal_a.rb +++ b/railties/test/fixtures/metal/subfolders/app/metal/Folder/metal_a.rb @@ -1,7 +1,7 @@ module Folder class MetalA < Rails::Rack::Metal def self.call(env) - [200, { "Content-Type" => "text/html"}, "Hi"] + [200, { "Content-Type" => "text/html"}, ["Hi"]] end end end diff --git a/railties/test/fixtures/metal/subfolders/app/metal/Folder/metal_b.rb b/railties/test/fixtures/metal/subfolders/app/metal/Folder/metal_b.rb index 430d7bfed6..7583363f71 100644 --- a/railties/test/fixtures/metal/subfolders/app/metal/Folder/metal_b.rb +++ b/railties/test/fixtures/metal/subfolders/app/metal/Folder/metal_b.rb @@ -1,7 +1,7 @@ module Folder class MetalB < Rails::Rack::Metal def self.call(env) - [200, { "Content-Type" => "text/html"}, "Hi"] + [200, { "Content-Type" => "text/html"}, ["Hi"]] end end end -- cgit v1.2.3