* Remove broken false positive broken tests.

* Ensure links don't get a slug when they shouldn't.

Author: peakpg

app/helpers/cms/form_tag_helper.rb

@@ -1,6 +1,10 @@
 module Cms
  module FormTagHelper
 
+ def forecasting_a_new_section?(form_object)
+ Cms::Section.with_path(form_object.object.class.path).first.nil?
+ end
+
  def slug_source_if(boolean)
  if boolean
  {class: 'slug-source'}
@@ -10,7 +14,7 @@ def slug_source_if(boolean)
  end
 
  def content_requires_slug_field?(method, form_object)
- method == :name && form_object.object.class.addressable? && form_object.object.respond_to?(:slug)
+ method == :name && form_object.object.class.requires_slug?
  end
 
  def should_autogenerate_slug?(method, form_object)

app/models/cms/link.rb

@@ -2,7 +2,6 @@ class Cms::Link < ActiveRecord::Base
  acts_as_content_block :connectable => false
 
  scope :named, lambda{|name| {:conditions => ["#{table_name}.name = ?", name]}}
- 
 
  validates_presence_of :name
 

app/views/cms/form_builder/_cms_path_field.html.erb

@@ -1,4 +1,4 @@
-<% if Cms::Section.with_path(f.object.class.path).first.nil?
+<% if forecasting_a_new_section?(f)
  cms_options[:instructions] = "Forecast: Saving this first #{f.object.class.display_name} will create a new section at #{f.object.class.path}."
  end
 %>

lib/cms/concerns/can_be_addressable.rb

@@ -35,6 +35,11 @@ def is_addressable(options={})
  def addressable?
  false
  end
+
+ # @return [Boolean] Some addressable content types don't require a slug.
+ def requires_slug?
+ false
+ end
  end
 
  # Implements behavior for displaying content blocks that should appear in the
@@ -47,12 +52,17 @@ def partial_for
  def hidden?
  false
  end
+
  end
 
  module Addressable
 
  module ClassMethods
 
+ def requires_slug?
+ !@path.nil?
+ end
+
  # The base path where new records will be added.
  # @return [String]
  def path

test/functional/cms/content_block_controller_test.rb

@@ -75,53 +75,4 @@ def expect_success
  get :usages, :id => 5
  end
 
- test "GET edit allows only users who are able to edit the block" do
- @user.stubs(:able_to_edit?).with(@block).returns(false)
- expect_access_denied
- get :edit, :id => 5
-
- @user.stubs(:able_to_edit?).with(@block).returns(true)
- expect_success
- get :edit, :id => 5
- end
-
- test "PUT update allows only users who are able to edit the block" do
- @user.stubs(:able_to_edit?).with(@block).returns(false)
- expect_access_denied
- put :update, :id => 5
-
- @user.stubs(:able_to_edit?).with(@block).returns(true)
- expect_success
- put :update, :id => 5
- end
-
- test "DELETE destroy allows only users who are able to publish the block" do
- @user.stubs(:able_to_publish?).with(@block).returns(false)
- expect_access_denied
- delete :destroy, :id => 5
-
- @user.stubs(:able_to_publish?).with(@block).returns(true)
- expect_success
- delete :destroy, :id => 5
- end
-
- test "PUT publish allows only users who are able to publish the block" do
- @user.stubs(:able_to_publish?).with(@block).returns(false)
- expect_access_denied
- put :publish, :id => 5
-
- @user.stubs(:able_to_publish?).with(@block).returns(true)
- expect_success
- put :publish, :id => 5
- end
-
- test "PUT revert_to allows only users who are able to publish the block" do
- @user.stubs(:able_to_publish?).with(@block).returns(false)
- expect_access_denied
- put :revert_to, :id => 5, :version => 1
-
- @user.stubs(:able_to_publish?).with(@block).returns(true)
- expect_success
- put :revert_to, :id => 5, :version => 1
- end
 end

test/functional/cms/sections_controller_test.rb

@@ -10,12 +10,6 @@ def setup
  given_there_is_a_sitemap
  end
 
- def test_edit
- get :edit, :id => root_section.to_param
- assert_response :success
- assert_select "input[name=?][value=?]", "section[name]", root_section.name
- end
-
  test "GET new should set the groups to the parent section's groups by default" do
  @group = create(:group, :name => "Test", :group_type => create(:group_type, :name => "CMS User", :cms_access => true))
  get :new, :section_id => root_section.to_param

test/unit/concerns/addressable_test.rb

@@ -74,6 +74,14 @@ class UsingDefaultTemplate < ActiveRecord::Base
  end
  UsingDefaultTemplate.layout.must_equal 'templates/default'
  end
+
+ it "should not require a slug unless a path was specified" do
+ HasSelfDefinedPath.requires_slug?.must_equal false
+ end
+
+ it "should require a slug if a path was specified" do
+ IsAddressable.requires_slug?.must_equal true
+ end
  end
 
  describe "#can_have_parent?" do