@@ -12,8 +12,9 @@ garlic do repo 'rails', :url => 'git://github.com/rails/rails'#, :local => "~/dev/vendor/rails" - repo 'rspec', :url => 'git://github.com/dchelimsky/rspec'#, :local => "~/dev/vendor/rspec" - repo 'rspec-rails', :url => 'git://github.com/dchelimsky/rspec-rails'#, :local => "~/dev/vendor/rspec-rails" + # targeting ianwhite/rspec as it has some outstanding patches applied + repo 'rspec', :url => 'git://github.com/ianwhite/rspec'#, :local => "~/dev/vendor/rspec" + repo 'rspec-rails', :url => 'git://github.com/ianhwite/rspec-rails'#, :local => "~/dev/vendor/rspec-rails" repo 'resources_controller', :path => '.' target 'edge' garlic_example.rb @@ -146,11 +146,9 @@ end describe ForumsController, " (checking that non actions are hidden)" do it "should only have CRUD actions as action_methods" do - pending "waiting for #469 on rspec to be accepted" do - @controller.class.send(:action_methods).should == Set.new([ - 'index', 'show', 'edit', 'new', 'update', 'create', 'destroy' - ]) - end + @controller.class.send(:action_methods).should == Set.new([ + 'index', 'show', 'edit', 'new', 'update', 'create', 'destroy' + ]) end end spec/controllers/forums_controller_spec.rb @@ -38,9 +38,7 @@ describe InfosController, " (its actions)" do end it "should have only ['show', 'edit', 'update'] in action_methods" do - pending "waiting for #469 on rspec to be accepted" do - @controller.class.send(:action_methods).should == Set.new(['show', 'edit', 'update']) - end + @controller.class.send(:action_methods).should == Set.new(['show', 'edit', 'update']) end it "GET /account/info should be successful" do spec/controllers/infos_controller_spec.rb e8deb367abe1ce4a00732c49af8d8becf60fbc40 Ian White ian.w.white@gmail.com http://github.com/ianwhite/resources_controller/commit/f69379470e88cf9dcd8b3b457e765f30687b064a f69379470e88cf9dcd8b3b457e765f30687b064a 2008-09-03T04:38:34-07:00 2008-09-03T04:38:34-07:00 Removing pending specs, as I'm targeting ianwhite/rspec for now (until various patches applied) c595ddc1c9290eccafda6e2e2c84f16874a0ee8d Ian White ian.w.white@gmail.com