diff options
| author | Xavier Noria <fxn@hashref.com> | 2010-05-01 02:23:47 -0700 |
|---|---|---|
| committer | Xavier Noria <fxn@hashref.com> | 2010-05-01 02:23:47 -0700 |
| commit | efba1d4227514a6ce4880910a6531b0a6c3c75aa (patch) | |
| tree | daff4155b8c19b915125ac0b0da458279358e743 /railties/test/fixtures/lib | |
| parent | 81807e0fe2879e08563c91ee6809ab6d1d0bd081 (diff) | |
| parent | 6c280f3398966ffba45069500ff43d632513fe44 (diff) | |
| download | rails-efba1d4227514a6ce4880910a6531b0a6c3c75aa.tar.gz rails-efba1d4227514a6ce4880910a6531b0a6c3c75aa.tar.bz2 rails-efba1d4227514a6ce4880910a6531b0a6c3c75aa.zip | |
Merge commit 'rails/master'
Conflicts:
railties/guides/source/index.html.erb
Diffstat (limited to 'railties/test/fixtures/lib')
| -rw-r--r-- | railties/test/fixtures/lib/empty_builder.rb | 2 | ||||
| -rw-r--r-- | railties/test/fixtures/lib/simple_builder.rb | 7 | ||||
| -rw-r--r-- | railties/test/fixtures/lib/tweak_builder.rb | 7 |
3 files changed, 16 insertions, 0 deletions
diff --git a/railties/test/fixtures/lib/empty_builder.rb b/railties/test/fixtures/lib/empty_builder.rb new file mode 100644 index 0000000000..babd9c2461 --- /dev/null +++ b/railties/test/fixtures/lib/empty_builder.rb @@ -0,0 +1,2 @@ +class AppBuilder +end
\ No newline at end of file diff --git a/railties/test/fixtures/lib/simple_builder.rb b/railties/test/fixtures/lib/simple_builder.rb new file mode 100644 index 0000000000..47dcdc0d96 --- /dev/null +++ b/railties/test/fixtures/lib/simple_builder.rb @@ -0,0 +1,7 @@ +class AppBuilder + def configru + create_file "config.ru", <<-R.strip +run proc { |env| [200, { "Content-Type" => "text/html" }, ["Hello World"]] } + R + end +end
\ No newline at end of file diff --git a/railties/test/fixtures/lib/tweak_builder.rb b/railties/test/fixtures/lib/tweak_builder.rb new file mode 100644 index 0000000000..eed20ecc9b --- /dev/null +++ b/railties/test/fixtures/lib/tweak_builder.rb @@ -0,0 +1,7 @@ +class AppBuilder < Rails::AppBuilder + def configru + create_file "config.ru", <<-R.strip +run proc { |env| [200, { "Content-Type" => "text/html" }, ["Hello World"]] } + R + end +end
\ No newline at end of file |