Converted CMS role names to lowercase, in conformance to ADAUsers practice.

Author: odf

app/models/user.rb

@@ -57,17 +57,17 @@ def to_s
 
   def is_staff?
     (roles & [Inkling::Role.find_by_name("administrator"),
-      Inkling::Role.find_by_name("Manager"),
-      Inkling::Role.find_by_name("Publisher"),
-      Inkling::Role.find_by_name("Approver"),
-      Inkling::Role.find_by_name("Archivist")]).any?
+      Inkling::Role.find_by_name("manager"),
+      Inkling::Role.find_by_name("publisher"),
+      Inkling::Role.find_by_name("approver"),
+      Inkling::Role.find_by_name("archivist")]).any?
   end
 
   def can_approve?
     (roles & [Inkling::Role.find_by_name("administrator"),
-      Inkling::Role.find_by_name("Manager"),
-      Inkling::Role.find_by_name("Publisher"),
-      Inkling::Role.find_by_name("Approver")]).any?
+      Inkling::Role.find_by_name("manager"),
+      Inkling::Role.find_by_name("publisher"),
+      Inkling::Role.find_by_name("approver")]).any?
   end
 
   private

db/bootstrap/development/inkling_roles.yml

@@ -6,21 +6,21 @@ inkling_roles_001:
   updated_at: 2010-11-24 09:15:14.160774
 inkling_roles_002: 
   id: "2"
-  name: Manager
+  name: manager
   created_at: 2010-11-24 09:15:14.516856
   updated_at: 2010-11-24 09:15:14.516856
 inkling_roles_003: 
   id: "3"
-  name: Approver
+  name: approver
   created_at: 2010-11-24 09:15:14.520097
   updated_at: 2010-11-24 09:15:14.520097
 inkling_roles_004: 
   id: "4"
-  name: Archivist
+  name: archivist
   created_at: 2010-11-24 09:15:14.522976
   updated_at: 2010-11-24 09:15:14.522976
 inkling_roles_005: 
   id: "5"
-  name: Member
+  name: member
   created_at: 2010-11-24 09:15:14.525827
   updated_at: 2010-11-24 09:15:14.525827

spec/acceptance/staff/archives/pages_spec.rb

@@ -58,7 +58,7 @@
 
   context "archivist" do  
     background do
-      @archivisit = make_user('Archivist')
+      @archivisit = make_user('archivist')
       sign_in(@archivisit)
     end
 

spec/acceptance/staff/news_spec.rb

@@ -53,7 +53,7 @@
 
   context "archivist" do  
     background do
-      @archivisit = make_user('Archivist')
+      @archivisit = make_user('archivist')
       sign_in(@archivisit)
     end
 

spec/lib/workflowable_spec.rb

@@ -17,15 +17,15 @@
   end
 
   specify "that only permitted roles are allowed to put a worklowable into the published state" do
-    ["administrator", "Manager", "Publisher", "Approver"].each do |role_name|
+    ["administrator", "manager", "publisher", "approver"].each do |role_name|
       @workflowable.draft?.should == true
       user = make_user(role_name)
       @workflowable.publish!(user)
       @workflowable.published?.should == true
       @workflowable.draft!
     end
 
-    user = make_user("Archivist")
+    user = make_user("archivist")
     @workflowable.publish!(user).should == false
   end
 end

spec/models/page_spec.rb

@@ -67,7 +67,7 @@
     context "Page object lifecycle should trigger appropriate moments in a matching menu item" do
       specify "when a page is published its menu_item should be published too" do
         p = Page.make
-        approver = make_user('Approver')
+        approver = make_user('approver')
         p.publish!(approver)
         p.menu_item.published?.should == true
       end

spec/models/user_spec.rb

@@ -14,7 +14,7 @@
 	end
 
 	specify "that archivists cannot approve workflowables" do
-		archivist = make_user("Archivist")
+		archivist = make_user("archivist")
 		archivist.can_approve?.should be_false
 	end
 end

spec/support/javascript.rb

@@ -20,7 +20,7 @@
 
   config.before(:each, :type => :acceptance) do
     #this is messy ... just hacking at getting specs working
-    ["administrator", "Manager", "Publisher", "Approver", "Archivist"].each do |role_name| 
+    ["administrator", "manager", "publisher", "approver", "archivist"].each do |role_name| 
       Inkling::Role.create!(:name => role_name) if Inkling::Role.find_by_name(role_name).nil?
     end    
 
@@ -46,4 +46,4 @@
     Capybara.use_default_driver if example.metadata[:js]
     DatabaseCleaner.clean
   end
-end
+end