spec/public/test/controller_matchers_spec.rb spec/public/test/controllers/controller_assertion_mock.rb spec/public/test/controllers/dispatch_controller.rb spec/public/test/controllers/spec_helper_controller.rb spec/public/test/multipart_request_helper_spec.rb spec/public/test/multipart_upload_text_file.txt spec/public/test/request_helper_spec.rb spec/public/test/route_helper_spec.rb spec/public/test/route_matchers_spec.rb spec/public/test/view_helper_spec.rb spec/public/test/view_matchers_spec.rb @@ -7,6 +7,4 @@ module Merb; module Test; end; end require 'merb-core/test/helpers' -require 'merb-core/test/matchers' - -require 'merb-core/test/example_groups' \ No newline at end of file +require 'merb-core/test/matchers' \ No newline at end of file lib/merb-core/test.rb @@ -2,4 +2,8 @@ module Merb::Test::Rspec; end require "merb-core/test/matchers/controller_matchers" require "merb-core/test/matchers/route_matchers" -require "merb-core/test/matchers/view_matchers" \ No newline at end of file +require "merb-core/test/matchers/view_matchers" + +Merb::Test::ControllerHelper.send(:include, Merb::Test::Rspec::ControllerMatchers) +Merb::Test::RouteHelper.send(:include, Merb::Test::Rspec::RouteMatchers) +Merb::Test::ViewHelper.send(:include, Merb::Test::Rspec::ViewMatchers) \ No newline at end of file lib/merb-core/test/matchers.rb lib/merb-core/test/example_groups.rb lib/merb-core/test/example_groups/controller_example_group.rb lib/merb-core/test/example_groups/helper_example_group.rb lib/merb-core/test/example_groups/merb_example_group.rb lib/merb-core/test/example_groups/model_example_group.rb lib/merb-core/test/example_groups/route_example_group.rb lib/merb-core/test/example_groups/view_example_group.rb spec/public/test/example_groups/controller_spec_spec.rb spec/public/test/example_groups/helper_spec_spec.rb spec/public/test/example_groups/merb_spec_spec.rb spec/public/test/example_groups/model_spec_spec.rb spec/public/test/example_groups/route_spec_spec.rb spec/public/test/example_groups/view_spec_spec.rb spec/public/test/example_groups/views/test/assigns.html.erb spec/public/test/example_groups/views/test/multiple_helpers.html.erb spec/public/test/example_groups/views/test/one_helper.html.erb spec/public/test/example_groups/views/test/simple.html.erb spec/public/test/helpers/controllers/controller_assertion_mock.rb spec/public/test/helpers/controllers/dispatch_controller.rb spec/public/test/helpers/controllers/spec_helper_controller.rb spec/public/test/helpers/multipart_request_helper_spec.rb spec/public/test/helpers/multipart_upload_text_file.txt spec/public/test/helpers/request_helper_spec.rb spec/public/test/helpers/route_helper_spec.rb spec/public/test/helpers/view_helper_spec.rb spec/public/test/matchers/controller_matchers_spec.rb spec/public/test/matchers/route_matchers_spec.rb spec/public/test/matchers/view_matchers_spec.rb cb956ab7bb2de23752b600116e12f5c4cd63dd80 Michael D. Ivey ivey@gweezlebur.com http://github.com/wycats/merb-core/commit/6867c0b8c4f8a985b7e75c571be9aea9e077861e 6867c0b8c4f8a985b7e75c571be9aea9e077861e 2008-03-25T23:00:21-07:00 2008-03-25T23:00:21-07:00 Revert ExampleGroup changes as they were causing failing specs Revert "Added render(template_path) feature to view specs." This reverts commit cb956ab7bb2de23752b600116e12f5c4cd63dd80. Revert "RSpec ExampleGroups for Merb controllers, views, helpers, models and routes." This reverts commit 15abc4e56f1675c04414a5dce902baeee8453cd7. 8a0a0b1e92fbb6b56ab040841967eaa651d3ab09 Michael D. Ivey ivey@gweezlebur.com