Changeset 273
- Timestamp:
- 06/07/07 21:10:25 (1 year ago)
- Files:
-
- mrblog/trunk/dist/app/controllers/files.rb (modified) (1 diff)
- mrblog/trunk/dist/conf/router.rb (modified) (1 diff)
- mrblog/trunk/test/spec/controllers/blog_spec.rb (modified) (1 diff)
- mrblog/trunk/test/spec/spec_helper.rb (modified) (1 diff)
Legend:
- Unmodified
- Added
- Removed
- Modified
- Copied
- Moved
mrblog/trunk/dist/app/controllers/files.rb
r235 r273 23 23 end 24 24 25 def xml 26 raise "Whack!" 27 end 28 29 def partial 30 render :partial => 'part', :locals => {:yo => 'Locals!'} 31 end 32 25 33 def file 26 34 send_file params[:file] mrblog/trunk/dist/conf/router.rb
r233 r273 11 11 12 12 puts "Compiling routes.." 13 Merb::Route Matcher.prepare do |r|13 Merb::Router.prepare do |r| 14 14 r.default_routes 15 15 r.add '/', :controller => 'blog', :action =>'index' mrblog/trunk/test/spec/controllers/blog_spec.rb
r235 r273 6 6 specify "should return list of posts" do 7 7 response, controller = get('/') 8 puts controller.instance_variables 8 9 response.should have_text(/louie/i) 9 10 response.should have_text(/FIrst Post!!1!/) mrblog/trunk/test/spec/spec_helper.rb
r235 r273 44 44 :adapter => 'mysql', 45 45 :username => 'root', 46 :password => 'xxxxx ',46 :password => 'xxxxxxx', 47 47 :database => 'mrblog_test', 48 48 :host => 'localhost'
