ActionItem1209: users cannot create events when its disabled

Moises Machado · Antonio Terceiro
1 parent 03c411eb
Showing 2 changed files with 17 additions and 6 deletions Show diff stats
app/controllers/my_profile/cms_controller.rb
test/functional/cms_controller_test.rb
@@ -21,9 +21,9 @@ class CmsController &lt; MyProfileController
   def available_article_types
     articles = [
       TinyMceArticle,
-      TextileArticle,
-      Event
+      TextileArticle
     ]
+    articles << Event unless profile.environment.enabled?(:disable_asset_events)
     parent_id = params ? params[:parent_id] : nil
     if !parent_id or !Article.find(parent_id).blog?
       articles += [
@@ -560,12 +560,12 @@ class CmsControllerTest &lt; Test::Unit::TestCase
   end
   should 'not make enterprise homepage available to person' do
-    @controller.stubs(:profile).returns(Person.new)
+    @controller.stubs(:profile).returns(create_user('test_user').person)
     assert_not_includes @controller.available_article_types, EnterpriseHomepage
   end
   should 'make enterprise homepage available to enterprises' do
-    @controller.stubs(:profile).returns(Enterprise.new)
+    @controller.stubs(:profile).returns(Enterprise.create(:name => 'test_ent', :identifier => 'test_ent'))
     assert_includes @controller.available_article_types, EnterpriseHomepage
   end
@@ -767,7 +767,7 @@ class CmsControllerTest &lt; Test::Unit::TestCase
   end
   should 'not offer folder to blog articles' do
-    @controller.stubs(:profile).returns(Enterprise.new)
+    @controller.stubs(:profile).returns(Enterprise.create(:name => 'test_ent', :identifier => 'test_ent'))
     blog = Blog.create!(:name => 'Blog for test', :profile => profile)
     @controller.stubs(:params).returns({ :parent_id => blog.id })
@@ -775,7 +775,7 @@ class CmsControllerTest &lt; Test::Unit::TestCase
   end
   should 'not offer rssfeed to blog articles' do
-    @controller.stubs(:profile).returns(Enterprise.new)
+    @controller.stubs(:profile).returns(Enterprise.create(:name => 'test_ent', :identifier => 'test_ent'))
     blog = Blog.create!(:name => 'Blog for test', :profile => profile)
     @controller.stubs(:params).returns({ :parent_id => blog.id })
@@ -1137,4 +1137,15 @@ class CmsControllerTest &lt; Test::Unit::TestCase
     assert_no_tag :tag => 'a', :attributes => { :href => "/myprofile/#{profile.identifier}/cms/upload_files?parent_id=#{profile.blog.id}"}
   end
+  should 'not offer to create events if events is disabled' do
+    e = profile.environment
+    e.enable(:disable_asset_events)
+    e.save!
+
+    get :new, :profile => profile.identifier
+
+
+    assert_not_includes assigns(:article_types).map{|at|at[:name]}, 'Event'
+  end
+
 end