From cf7c09222018fd2853afe00a305f1144312ceea4 Mon Sep 17 00:00:00 2001 From: Skud Date: Sun, 13 Jan 2013 12:58:26 +1100 Subject: [PATCH] FGified models/garden tests. Also tweaked slug generation to be lowercase, and avoid spaces in slugs. This probably needs more work to handle unusual characters, but I punted on that for now. --- app/models/garden.rb | 3 ++- spec/models/garden_spec.rb | 8 +++----- 2 files changed, 5 insertions(+), 6 deletions(-) diff --git a/app/models/garden.rb b/app/models/garden.rb index 784bf0aa4..1e2c7faa8 100644 --- a/app/models/garden.rb +++ b/app/models/garden.rb @@ -6,7 +6,8 @@ class Garden < ActiveRecord::Base belongs_to :user def garden_slug - "#{user.username}-#{name}" + formatted_name = name.downcase.gsub(' ', '-') + "#{user.username}-#{formatted_name}" end def owner diff --git a/spec/models/garden_spec.rb b/spec/models/garden_spec.rb index 53a39892b..81c95fe4c 100644 --- a/spec/models/garden_spec.rb +++ b/spec/models/garden_spec.rb @@ -2,14 +2,12 @@ require 'spec_helper' describe Garden do before :each do - @user = mock_model(User) - @user.stub!(:username).and_return("test1") - @garden = Garden.new(:name => "my garden") - @garden.user = @user + @user = FactoryGirl.create(:user) + @garden = FactoryGirl.create(:garden, :user => @user) end it "should have a slug" do - @garden.garden_slug.should == "test1-my garden" + @garden.garden_slug.should == "user1-my-garden" end it "should have an owner" do