db/migrate/20090929164633_rename_developer_role_to_designer.rb @@ -1,8 +1,8 @@ class Admin::LayoutsController < Admin::ResourceController only_allow_access_to :index, :show, :new, :create, :edit, :update, :remove, :destroy, - :when => [:developer, :admin], + :when => [:designer, :admin], :denied_url => { :controller => 'admin/pages', :action => 'index' }, - :denied_message => 'You must have developer privileges to perform this action.' + :denied_message => 'You must have designer privileges to perform this action.' def show respond_to do |format| app/controllers/admin/layouts_controller.rb @@ -1,8 +1,8 @@ class Admin::SnippetsController < Admin::ResourceController only_allow_access_to :index, :show, :new, :create, :edit, :update, :remove, :destroy, - :when => [:developer, :admin], + :when => [:designer, :admin], :denied_url => { :controller => 'admin/pages', :action => 'index' }, - :denied_message => 'You must have developer privileges to perform this action.' + :denied_message => 'You must have designer privileges to perform this action.' def show respond_to do |format| app/controllers/admin/snippets_controller.rb @@ -2,7 +2,7 @@ module Admin::UsersHelper def roles(user) roles = [] roles << 'Administrator' if user.admin? - roles << 'Developer' if user.developer? + roles << 'Designer' if user.designer? roles.join(', ') end end app/helpers/admin/users_helper.rb @@ -92,8 +92,8 @@ module ApplicationHelper current_user and current_user.admin? end - def developer? - current_user and (current_user.developer? or current_user.admin?) + def designer? + current_user and (current_user.designer? or current_user.admin?) end def focus(field_name) app/helpers/application_helper.rb @@ -26,8 +26,8 @@ %label.multi_option Roles = f.check_box "admin", :class => "checkbox" = f.label :admin, "Administrator", :class => "checkbox" - = f.check_box "developer", :class => "checkbox" - = f.label :developer, "Developer", :class => "checkbox" + = f.check_box "designer", :class => "checkbox" + = f.label :designer, "Designer", :class => "checkbox" - form.edit_notes do %p app/views/admin/users/_form.html.haml @@ -9,7 +9,7 @@ # # It's strongly recommended to check this file into your version control system. -ActiveRecord::Schema.define(:version => 20081203140407) do +ActiveRecord::Schema.define(:version => 20090929164633) do create_table "config", :force => true do |t| t.string "key", :limit => 40, :default => "", :null => false @@ -100,7 +100,7 @@ ActiveRecord::Schema.define(:version => 20081203140407) do t.integer "created_by_id" t.integer "updated_by_id" t.boolean "admin", :default => false, :null => false - t.boolean "developer", :default => false, :null => false + t.boolean "designer", :default => false, :null => false t.text "notes" t.integer "lock_version", :default => 0 t.string "salt" db/schema.rb @@ -1,9 +1,9 @@ Feature: Managing snippets In order to properly display the content - As a developer I want to manage the layouts + As a designer I want to manage the layouts Background: - Given I am logged in as "developer" + Given I am logged in as "designer" Scenario: View a layout When I view a layout features/admin/layouts_management.feature @@ -1,13 +1,12 @@ Feature: Managing snippets - In order to remove the repetition of entering the same content - multiple times and allow applying the same block to small pieces of - content, as a content editor I want to manage a collection of snippets + In order to share content between layouts and pages, as a designer I want to + manage a collection of snippets Background: - Given I am logged in as "developer" + Given I am logged in as "designer" Scenario: List snippets - When I follow "Design" + When I follow "Design" within "navigation" And I follow "Snippets" Then I should see "first" And I should see "another" @@ -15,7 +14,7 @@ Feature: Managing snippets # And a host of others Scenario: Create a snippet - When I follow "Design" + When I follow "Design" within "navigation" And I follow "Snippets" And I follow "New Snippet" And I fill in "Name" with "Mine" @@ -25,7 +24,7 @@ Feature: Managing snippets And I should see "Mine" Scenario: Display form errors - When I follow "Design" + When I follow "Design" within "navigation" And I follow "Snippets" And I follow "New Snippet" And I fill in "Body" with "My snippet" @@ -34,7 +33,7 @@ Feature: Managing snippets And I should see the form Scenario: Continue editing - When I follow "Design" + When I follow "Design" within "navigation" And I follow "Snippets" And I follow "New Snippet" And I fill in "Name" with "Mine" @@ -48,7 +47,7 @@ Feature: Managing snippets Then I should see "Edit Snippet" Scenario: Delete a snippet with confirmation - When I follow "Design" + When I follow "Design" within "navigation" And I follow "Snippets" And I follow "Remove" Then I should see "permanently remove" features/admin/snippets_management.feature @@ -14,7 +14,7 @@ Feature: User authentication and permissions | username | | admin | | existing | - | developer | + | designer | Scenario Outline: Authentication-logout Given I am logged in as "<username>" @@ -25,7 +25,7 @@ Feature: User authentication and permissions | username | | admin | | existing | - | developer | + | designer | Scenario Outline: All users can edit pages @@ -40,41 +40,41 @@ Feature: User authentication and permissions | username | | admin | | existing | - | developer | + | designer | - Scenario Outline: Admins and developers can see and edit snippets + Scenario Outline: Admins and designers can see and edit snippets Given I am logged in as "<username>" And I should see "Design" - When I follow "Design" + When I follow "Design" within "navigation" And I follow "Snippets" - And I should not see "You must have developer privileges" + And I should not see "You must have designer privileges" And I follow "first" Then I should see "Edit Snippet" Examples: | username | | admin | - | developer | + | designer | - Scenario Outline: Admins and developers can see and edit layouts + Scenario Outline: Admins and designers can see and edit layouts Given I am logged in as "<username>" And I should see "Design" - When I follow "Design" + When I follow "Design" within "navigation" And I follow "Layouts" - And I should not see "You must have developer privileges" + And I should not see "You must have designer privileges" And I follow "Main" Then I should see "Edit Layout" Examples: | username | | admin | - | developer | + | designer | Scenario Outline: Ordinary users cannot edit layouts Given I am logged in as "<username>" And I should not see "Design" When I go to "/admin/layouts" - Then I should see "You must have developer privileges" + Then I should see "You must have designer privileges" Examples: | username | @@ -85,7 +85,7 @@ Feature: User authentication and permissions Given I am logged in as "<username>" And I should not see "Design" When I go to "/admin/snippets" - Then I should see "You must have developer privileges" + Then I should see "You must have designer privileges" Examples: | username | @@ -110,7 +110,7 @@ Feature: User authentication and permissions | username | | existing | | another | - | developer | + | designer | Scenario Outline: Non-admins see preferences link Given I am logged in as "<username>" @@ -123,7 +123,7 @@ Feature: User authentication and permissions | username | | existing | | another | - | developer | + | designer | Scenario: Admin users can see extensions Given I am logged in as "admin" @@ -142,7 +142,7 @@ Feature: User authentication and permissions | username | | existing | | another | - | developer | + | designer | Scenario Outline: Anyone can export YAML Given I am logged in as "<username>" @@ -154,4 +154,4 @@ Feature: User authentication and permissions | admin | | existing | | another | - | developer | \ No newline at end of file + | designer | \ No newline at end of file features/admin/user_permissions.feature @@ -14,5 +14,5 @@ Feature: Edit user preferences | admin | | another | | existing | - | developer | + | designer | | non_admin | features/admin/user_preferences.feature @@ -7,7 +7,7 @@ Feature: Managing users And I go to "/admin/users" Scenario: Listing users Then I should see "Admin" - And I should see "Developer" + And I should see "Designer" And I should see "Existing" # And a host of others @@ -35,14 +35,14 @@ Feature: Managing users And I should see the form Scenario: Edit existing user - When I follow "Developer" + When I follow "Designer" Then I should see the form When I fill in "Name" with "Old Guy" And I fill in "Username" with "oldguy" - And I uncheck "Developer" + And I uncheck "Designer" And I press "Save Changes" Then I should see "Old Guy" - But I should not see "Developer" + But I should not see "Designer" Scenario: Cannot remove self When I attempt to remove my own account features/admin/users_management.feature @@ -19,6 +19,10 @@ When /^I follow "([^\"]*)"$/ do |link| click_link(link) end +When /^I follow "([^\"]*)" within "([^\"]*)"$/ do |link, element_id| + click_link_within("##{element_id}", link) +end + When /^I fill in "([^\"]*)" with "([^\"]*)"$/ do |field, value| fill_in(field, :with => value) end @@ -115,3 +119,7 @@ end Then /^I should be on (.+)$/ do |page_name| URI.parse(current_url).path.should == path_to(page_name) end + +Then /^show me the page$/ do + save_and_open_page +end features/step_definitions/webrat_steps.rb @@ -120,7 +120,7 @@ module Radiant content << nav_item(:pages, "Pages", "/admin/pages") nav << content - design = nav_tab(:design, "Design", [:developer, :admin]) + design = nav_tab(:design, "Design", [:designer, :admin]) design << nav_item(:layouts, "Layouts", "/admin/layouts") design << nav_item(:snippets, "Snippets", "/admin/snippets") nav << design lib/radiant/admin_ui.rb @@ -4,7 +4,7 @@ describe Admin::ExportController do dataset :users_and_pages before :each do - login_as :developer + login_as :designer end it "should export a YAML file" do spec/controllers/admin/export_controller_spec.rb @@ -4,7 +4,7 @@ describe Admin::LayoutsController do dataset :users, :pages_with_layouts before :each do - login_as :developer + login_as :designer end it "should be a ResourceController" do @@ -71,21 +71,21 @@ describe Admin::LayoutsController do lambda { send(method, action).should require_login } end - it "should allow access to developers for the #{action} action" do + it "should allow access to designers for the #{action} action" do lambda { send(method, action, :id => layout_id(:main)) - }.should restrict_access(:allow => [users(:developer)], + }.should restrict_access(:allow => [users(:designer)], :url => '/admin/pages') end it "should allow access to admins for the #{action} action" do lambda { send(method, action, :id => layout_id(:main)) - }.should restrict_access(:allow => [users(:developer)], + }.should restrict_access(:allow => [users(:designer)], :url => '/admin/pages') end - it "should deny non-developers and non-admins for the #{action} action" do + it "should deny non-designers and non-admins for the #{action} action" do lambda { send(method, action, :id => layout_id(:main)) }.should restrict_access(:deny => [users(:non_admin), users(:existing)], spec/controllers/admin/layouts_controller_spec.rb @@ -120,7 +120,7 @@ describe Admin::PagesController do describe "permissions" do - [:admin, :developer, :non_admin, :existing].each do |user| + [:admin, :designer, :non_admin, :existing].each do |user| { :post => :create, :put => :update, @@ -173,14 +173,14 @@ describe Admin::PagesController do :url => '/admin/pages') end - it "should allow access to developers for the #{action} action" do + it "should allow access to designers for the #{action} action" do lambda { send(:get, action, @parameters.call) - }.should restrict_access(:allow => [users(:developer)], + }.should restrict_access(:allow => [users(:designer)], :url => '/admin/pages') end - it "should allow non-developers and non-admins for the #{action} action" do + it "should allow non-designers and non-admins for the #{action} action" do lambda { send(:get, action, @parameters.call) }.should restrict_access(:allow => [users(:non_admin), users(:existing)], spec/controllers/admin/pages_controller_spec.rb @@ -5,7 +5,7 @@ describe Admin::SnippetsController do before :each do ActionController::Routing::Routes.reload - login_as :developer + login_as :designer end it "should be an ResourceController" do @@ -79,21 +79,21 @@ describe Admin::SnippetsController do response.response_code.should == 401 end else - it "should allow access to developers for the #{action} action" do + it "should allow access to designers for the #{action} action" do lambda { send(method, action, :id => snippet_id(:first)) - }.should restrict_access(:allow => [users(:developer)], + }.should restrict_access(:allow => [users(:designer)], :url => '/admin/pages') end it "should allow access to admins for the #{action} action" do lambda { send(method, action, :id => snippet_id(:first)) - }.should restrict_access(:allow => [users(:developer)], + }.should restrict_access(:allow => [users(:designer)], :url => '/admin/pages') end - it "should deny non-developers and non-admins for the #{action} action" do + it "should deny non-designers and non-admins for the #{action} action" do lambda { send(method, action, :id => Snippet.first.id) }.should restrict_access(:deny => [users(:non_admin), users(:existing)], spec/controllers/admin/snippets_controller_spec.rb @@ -75,7 +75,7 @@ describe Admin::UsersController do it "should deny you access to #{action} action if you are not an admin" do lambda { send(method, action, :id => user_id(:existing)) - }.should restrict_access(:deny => [users(:developer), users(:existing)], + }.should restrict_access(:deny => [users(:designer), users(:existing)], :url => '/admin/page') end end spec/controllers/admin/users_controller_spec.rb @@ -4,7 +4,7 @@ class UsersDataset < Dataset::Base create_user "Existing" create_user "Another" create_user "Admin", :admin => true - create_user "Developer", :developer => true + create_user "Designer", :designer => true create_user "Non-admin", :admin => false end spec/datasets/users_dataset.rb @@ -5,7 +5,7 @@ describe Admin::UsersHelper do it "should render a string containing the user's roles" do helper.roles(users(:admin)).should == "Administrator" - helper.roles(users(:developer)).should == "Developer" + helper.roles(users(:designer)).should == "Designer" helper.roles(users(:existing)).should == '' end end \ No newline at end of file spec/helpers/admin/users_helper_spec.rb @@ -109,9 +109,9 @@ describe ApplicationHelper do helper.admin?.should be_true end - it "should determine whether the current user is a developer" do - helper.should_receive(:current_user).at_least(1).times.and_return(users(:developer)) - helper.developer?.should be_true + it "should determine whether the current user is a designer" do + helper.should_receive(:current_user).at_least(1).times.and_return(users(:designer)) + helper.designer?.should be_true end it "should render a Javascript snippet that focuses a given field" do spec/helpers/application_helper_spec.rb @@ -13,7 +13,7 @@ class NoLoginRequiredChildController < NoLoginRequiredController; end class LoginRequiredGrandChildController < NoLoginRequiredChildController; login_required; end class PrivilegedUsersOnlyController < LoginRequiredController only_allow_access_to :edit, :new, - :when => [:admin, :developer], + :when => [:admin, :designer], :denied_url => '/login_required', :denied_message => 'Fun.' def edit; render :text => 'just a test'; end spec/lib/login_system_spec.rb @@ -69,15 +69,15 @@ describe Radiant::AdminUI::NavTab do end it "should restrict to a specific role" do - @tab.visibility.replace [:developer] - @tab.should be_visible(users(:developer)) + @tab.visibility.replace [:designer] + @tab.should be_visible(users(:designer)) @tab.should_not be_visible(users(:admin)) @tab.should_not be_visible(users(:existing)) end it "should restrict to a group of roles" do - @tab.visibility.replace [:developer, :admin] - @tab.should be_visible(users(:developer)) + @tab.visibility.replace [:designer, :admin] + @tab.should be_visible(users(:designer)) @tab.should be_visible(users(:admin)) @tab.should_not be_visible(users(:existing)) end @@ -144,7 +144,7 @@ describe Radiant::AdminUI::NavSubItem do it "should not be visible when the parent tab is not visible to the user" do @tab.visibility.replace [:admin] - @subitem.should_not be_visible(users(:developer)) + @subitem.should_not be_visible(users(:designer)) @subitem.should_not be_visible(users(:existing)) end spec/lib/radiant/admin_ui/nav_tabs_spec.rb @@ -192,12 +192,12 @@ describe User, "roles" do end it "should not have a role for which the corresponding method returns false" do - users(:existing).has_role?(:developer).should be_false + users(:existing).has_role?(:designer).should be_false users(:existing).has_role?(:admin).should be_false end it "should have a role for which the corresponding method returns true" do - users(:developer).has_role?(:developer).should be_true + users(:designer).has_role?(:designer).should be_true users(:admin).has_role?(:admin).should be_true end end \ No newline at end of file spec/models/user_spec.rb 77b224316a260e969a15dee115721c0d03d38c13 John W. Long me@johnwlong.com http://github.com/radiant/radiant/commit/d5761fccd85a3579ebcf22089d87f85ccdbff339 d5761fccd85a3579ebcf22089d87f85ccdbff339 2009-09-29T15:18:35-07:00 2009-09-29T15:18:35-07:00 renamed "developer" role to "designer" c6b3a31d9d1c3672c52799f64f39affb0171ac17 John W. Long me@johnwlong.com