spec/spec_helpers/app_specific.rb spec/spec_helpers/app_specific/article_spec_helper.rb spec/spec_helpers/core.rb spec/spec_helpers/core/default_controller_helper.rb spec/spec_helpers/core/default_model_helper.rb spec/spec_helpers/core/default_spec_helper.rb spec/spec_helpers/shared_behaviors.rb spec/spec_helpers/shared_behaviors/default_controller_behavior.rb spec/spec_helpers/shared_behaviors/required_fields.rb spec/spec_helpers/shared_behaviors/timestamps.rb @@ -1,13 +1,56 @@ class Articles < Application + provides :xml, :js, :yaml def index @articles = Article.all - render + render @articles + end + + def show(id) + @article = Article.find(id) + raise NotFound unless @article + render @article + end + + def new + only_provides :html + @article = Article.new + render @article + end + + def create(article) + @article = Article.new(article) + if @article.save + redirect url(:article, @article) + else + render :action => :new + end end - - def show - @article = Article.find params[:id] + + def edit(id) + only_provides :html + @article = Article.find(id) + raise NotFound unless @article render end - + + def update(id, article) + @article = Article.find(id) + raise NotFound unless @article + if @article.update_attributes(article) + redirect url(:article, @article) + else + raise BadRequest + end + end + + def destroy(id) + @article = Article.find(id) + raise NotFound unless @article + if @article.destroy! + redirect url(:articles) + else + raise BadRequest + end + end end \ No newline at end of file app/controllers/articles.rb @@ -8,10 +8,13 @@ class Article < DataMapper::Base has_many :comments - before_save :set_slug + validates_presence_of :title + validates_presence_of :slug - def set_slug(slug = self.title) - self.slug = slug.gsub(" ", "_") + before_validation :set_slug + + def set_slug(slug_title = self.title) + self.slug = slug_title.gsub(" ", "_") if slug_title end end app/models/article.rb @@ -1,45 +1,9 @@ require File.join(File.dirname(__FILE__), '..', 'spec_helper.rb') -describe "Articles Controller", "index action" do - before(:each) do - @article1 = mock("article") - @article2 = mock("article") - @articles = [@article1, @article2] - Article.should_receive(:all).and_return(@articles) - @controller = Articles.build(fake_request) - @controller.stub!(:render) - @controller.dispatch('index') - end - - it "should get successfully" do - @controller.status.should == 200 - end - - it "should assign all articles" do - @controller.instance_variable_get("@articles").should == @articles - end -end - -describe "Articles Controller", "show action" do - before(:each) do - @article = mock("@article") - @article.stub!(:id).and_return(1) - Article.stub!(:find_by_id).and_return(@article) - end - - it "should return only one article" do - Article.should_receive(:find).with('1').and_return(@article) - request(:get, '/articles/1', :yields => controller) - end - - it "should only return comments associated with this article" - -end +describe Articles do + include DefaultSpecHelper + include DefaultControllerHelper + include ArticleSpecHelper -describe "Articles Controller", "destroy action" do - - it "should only delete one article" - it "should delete all comments owned by the deleted article" - + it_should_behave_like "default controller behavior" end - spec/controllers/articles_spec.rb @@ -1,24 +1,18 @@ require File.join( File.dirname(__FILE__), "..", "spec_helper" ) describe Article do - before(:each) do - @article = Article.new - end - - it "should have a title" do - @article.title = "First article!" - @article.title.should == "First article!" - end - - it "should have a body" do - @article.body = "The body of the article" - @article.body.should == "The body of the article" - end + include DefaultSpecHelper + include DefaultModelHelper + include ArticleSpecHelper + + it_should_behave_like "timestamps work correctly" + it_should_behave_like "validates required fields" it "should build a slug" do - @article.title = "Page One" - @article.save - @article.slug.should == "Page_One" + article = Article.new(:title => "Page One") + article.save + article.should_not be_nil + article.slug.should == "Page_One" end end \ No newline at end of file spec/models/article_spec.rb @@ -1,11 +1,17 @@ +dir = File.dirname(__FILE__) $TESTING=true -require File.join(File.dirname(__FILE__), "..", 'config', 'boot') +require File.join(dir, "..", 'config', 'boot') Merb.environment="test" require File.join(Merb.root, 'config', 'merb_init') require 'merb/test/helper' require 'merb/test/rspec' +require "#{dir}/spec_helpers/core" +require "#{dir}/spec_helpers/custom_matchers" +require "#{dir}/spec_helpers/shared_behaviors" +require "#{dir}/spec_helpers/app_specific" + Spec::Runner.configure do |config| config.include(Merb::Test::Helper) config.include(Merb::Test::RspecMatchers) spec/spec_helper.rb spec/spec_helpers/shared_behaviours.rb d25bbb297e0d0b94095f85b6492dd3f2f9e9666b Jeff Whitmire jeff@jwhitmire.com http://github.com/hornbeck/blerb-core/commit/ef6f08553d511bd3cc9108ae043c9fba35cc2aa6 ef6f08553d511bd3cc9108ae043c9fba35cc2aa6 2008-01-28T09:00:10-08:00 2008-01-28T09:00:10-08:00 implemented default model/controller behaviors; refactored spec_helpers directory fbc2067ec5e94b72d88f3f71bccaef3cf1cf4847 Jeff Whitmire jeff@jwhitmire.com