spec/integration/merb/.gitignore spec/integration/merb/Rakefile spec/integration/merb/app/controllers/application.rb spec/integration/merb/app/controllers/exceptions.rb spec/integration/merb/app/controllers/testing.rb spec/integration/merb/app/views/exceptions/not_acceptable.html.erb spec/integration/merb/app/views/exceptions/not_found.html.erb spec/integration/merb/app/views/layout/application.html.erb spec/integration/merb/app/views/testing/show_form.html.erb spec/integration/merb/config/environments/development.rb spec/integration/merb/config/environments/rake.rb spec/integration/merb/config/environments/test.rb spec/integration/merb/config/init.rb spec/integration/merb/config/rack.rb spec/integration/merb/config/router.rb spec/integration/merb/spec/spec.opts spec/integration/merb/spec/spec_helper.rb spec/integration/merb/spec/webrat_spec.rb spec/integration/merb/tasks/merb.thor/app_script.rb spec/integration/merb/tasks/merb.thor/common.rb spec/integration/merb/tasks/merb.thor/gem_ext.rb spec/integration/merb/tasks/merb.thor/main.thor spec/integration/merb/tasks/merb.thor/ops.rb spec/integration/merb/tasks/merb.thor/utils.rb @@ -110,6 +110,11 @@ namespace :spec do result = system "rake test:integration" raise "Tests failed" unless result end + + Dir.chdir "spec/integration/merb" do + result = system "rake spec" + raise "Tests failed" unless result + end end end Rakefile add38820e58cba6a7e1ee62155c29480a9d1d913 Bryan Helmkamp bryan@brynary.com http://github.com/brynary/webrat/commit/2562942b6db665ee171bb15b907fdb4ab6ab2bf7 2562942b6db665ee171bb15b907fdb4ab6ab2bf7 2008-12-28T23:10:05-08:00 2008-12-28T23:10:05-08:00 Adding merb app for integration testing 91b03ee423cbb91cf470e1b8eed6fba60f5808ff Bryan Helmkamp bryan@brynary.com