Commit 6867c0b8c4f8a985b7e75c571be9aea9e077861e to wycats's merb-core

6867c0b
all branches
all tags
- v0.9.0
- v0.9.1
- v0.9.2
- v0.9.3
- v0.9.4
- v0.9.5
- v0.9.6
- v0.9.7
- v0.9.8
comments

wycats / merb-core

635

Description:	Merb Core: All you need. None you don't. edit
Homepage:	http://www.merbivore.com edit
Public Clone URL:	git://github.com/wycats/merb-core.git Give this clone URL to anyone. `git clone git://github.com/wycats/merb-core.git`
Your Clone URL:	git@github.com:wycats/merb-core.git Use this clone URL yourself. `git clone git@github.com:wycats/merb-core.git`

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.

ivey (author)

Tue Mar 25 23:00:21 -0700 2008

commit 6867c0b8c4f8a985b7e75c571be9aea9e077861e
tree 8a0a0b1e92fbb6b56ab040841967eaa651d3ab09
parent cb956ab7bb2de23752b600116e12f5c4cd63dd80

lib/merb-core/test.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
lib/merb-core/test/matchers.rb
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/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
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

lib/merb-core/test.rb

0
@@ -7,6 +7,4 @@ module Merb; module Test; end; end
0
 
0
 require 'merb-core/test/helpers'
0
 
0
-require 'merb-core/test/matchers'
0
-
0
-require 'merb-core/test/example_groups'
0
\ No newline at end of file
0
+require 'merb-core/test/matchers'
0
\ No newline at end of file

lib/merb-core/test/matchers.rb

0
@@ -2,4 +2,8 @@ module Merb::Test::Rspec; end
0
 
0
 require "merb-core/test/matchers/controller_matchers"
0
 require "merb-core/test/matchers/route_matchers"
0
-require "merb-core/test/matchers/view_matchers"
0
\ No newline at end of file
0
+require "merb-core/test/matchers/view_matchers"
0
+
0
+Merb::Test::ControllerHelper.send(:include, Merb::Test::Rspec::ControllerMatchers)
0
+Merb::Test::RouteHelper.send(:include, Merb::Test::Rspec::RouteMatchers)
0
+Merb::Test::ViewHelper.send(:include, Merb::Test::Rspec::ViewMatchers)
0
\ No newline at end of file

Comments