features/categories.feature features/support/blueprints/categories.rb @@ -18,3 +18,4 @@ config/newrelic.yml .gitignore.swp public/avatars vendor/plugins/newrelic_rpm +webrat*.html .gitignore @@ -21,7 +21,7 @@ class Admin::CategoriesController < Admin::ApplicationController def create @category = Category.new(params[:category]) if @category.save - flash[:notice] = t(:created, :thing => "category") + flash[:notice] = t(:created, :thing => "Category") redirect_to admin_categories_path else flash[:notice] = t(:not_created, :thing => "category") @@ -36,7 +36,7 @@ class Admin::CategoriesController < Admin::ApplicationController # Updates a category. def update if @category.update_attributes(params[:category]) - flash[:notice] = t(:updated, :thing => "category") + flash[:notice] = t(:updated, :thing => "Category") redirect_to admin_categories_path else flash[:notice] = t(:not_updated, :thing => "category") app/controllers/admin/categories_controller.rb @@ -8,5 +8,7 @@ class Category < ActiveRecord::Base has_many :groups, :through => :permissions named_scope :without_parent, :conditions => { :parent_id => nil }, :include => :permissions + + validates_presence_of :name end app/models/category.rb @@ -1,6 +1,6 @@ <tr> <td class='icon'> - <%= link_to theme_image_tag("edit.jpg"), edit_admin_category_path(category) %> + <%= link_to theme_image_tag("edit.jpg"), edit_admin_category_path(category), :id => "edit_category_#{category.id}" %> <%= link_to theme_image_tag("delete.jpg"), admin_category_path(category), :method => "delete", :confirm => t(:confirm_deletion, :thing => "category") %> </td> app/views/admin/categories/_category.html.erb @@ -36,7 +36,6 @@ Feature: Forums When I follow "Closed Forum" Then I should not see "New Topic" When I follow "Closed Forum's Topic" - When I dump the page Then I should not see "New Reply" Scenario: Administrators should be able to create new forums features/forums.feature @@ -5,4 +5,5 @@ end Forum.blueprint(:public_forum) do title "Public Forum" + category { Category.make(:public) } end features/support/blueprints/forums.rb @@ -1,5 +1,6 @@ Permission.blueprint do can_see_forum true + can_see_category true group { Group.ensure("Anonymous") } end features/support/blueprints/permissions.rb @@ -12,7 +12,7 @@ Feature: Topics When I fill in "subject" with "Tribute" When I fill in "Text" with "This is just a tribute" When I press "Create" - Then I should see "rBoard -> Public Forum -> Tribute" + Then I should see "rBoard -> Public Category -> Public Forum -> Tribute" Scenario: Registered users should not be able to post new topics in closed forums Given I am logged in as "registered_user" features/topics.feature 516d2dc39c63a3aa29aa0c4c51363bfbf27e880c Ryan Bigg radarlistener@gmail.com http://github.com/radar/rboard/commit/eba5d458a75360d2bc5068da4d6b380419fba9c0 eba5d458a75360d2bc5068da4d6b380419fba9c0 2009-08-23T00:33:31-07:00 2009-08-23T00:33:31-07:00 Added features for creating and updating categories. 2e62f59966398e2f0a03f42a849a4d1cc0fb717f Ryan Bigg radarlistener@gmail.com