Add can_comment and can_edit_dossier abilities to valuators

spec/features/admin/valuator_groups_spec.rb

@@ -88,7 +88,7 @@ describe "Valuator groups" do
       visit edit_admin_valuator_path(valuator)
 
       select "Health", from: "valuator_valuator_group_id"
-      click_button "Update valuator"
+      click_button "Update Valuator"
 
       expect(page).to have_content "Valuator updated successfully"
       expect(page).to have_content "Health"
@@ -102,7 +102,7 @@ describe "Valuator groups" do
 
       visit edit_admin_valuator_path(valuator)
       select "Economy", from: "valuator_valuator_group_id"
-      click_button "Update valuator"
+      click_button "Update Valuator"
 
       expect(page).to have_content "Valuator updated successfully"
       expect(page).to have_content "Economy"
@@ -115,7 +115,7 @@ describe "Valuator groups" do
 
       visit edit_admin_valuator_path(valuator)
       select "", from: "valuator_valuator_group_id"
-      click_button "Update valuator"
+      click_button "Update Valuator"
 
       expect(page).to have_content "Valuator updated successfully"
       expect(page).not_to have_content "Health"

spec/features/admin/valuators_spec.rb

@@ -2,104 +2,112 @@ require "rails_helper"
 
 describe "Admin valuators" do
 
+  let(:admin) { create(:administrator) }
+  let!(:user) { create(:user, username: "Jose Luis Balbin") }
+  let!(:valuator) { create(:valuator) }
+
   before do
-    @admin    = create(:administrator)
-    @user     = create(:user, username: "Jose Luis Balbin")
-    @valuator = create(:valuator)
-    login_as(@admin.user)
+    login_as(admin.user)
     visit admin_valuators_path
   end
 
   scenario "Show" do
-    visit admin_valuator_path(@valuator)
+    visit admin_valuator_path(valuator)
 
-    expect(page).to have_content @valuator.name
-    expect(page).to have_content @valuator.description
-    expect(page).to have_content @valuator.email
+    expect(page).to have_content valuator.name
+    expect(page).to have_content valuator.description
+    expect(page).to have_content valuator.email
+    expect(page).to have_content "Can comment, Can edit dossier"
   end
 
   scenario "Index" do
-    expect(page).to have_content(@valuator.name)
-    expect(page).to have_content(@valuator.email)
-    expect(page).not_to have_content(@user.name)
+    expect(page).to have_content(valuator.name)
+    expect(page).to have_content(valuator.email)
+    expect(page).not_to have_content(user.name)
   end
 
   scenario "Create", :js do
-    fill_in "name_or_email", with: @user.email
+    fill_in "name_or_email", with: user.email
     click_button "Search"
 
-    expect(page).to have_content(@user.name)
+    expect(page).to have_content(user.name)
     click_button "Add to valuators"
 
     within("#valuators") do
-      expect(page).to have_content(@user.name)
+      expect(page).to have_content(user.name)
     end
   end
 
   scenario "Edit" do
-    visit edit_admin_valuator_path(@valuator)
+    visit edit_admin_valuator_path(valuator)
+
+    expect(page).to have_field("Can create comments", checked: true)
+    expect(page).to have_field("Can edit dossiers", checked: true)
 
     fill_in "valuator_description", with: "Valuator for health"
-    click_button "Update valuator"
+    uncheck "Can edit dossiers"
+    click_button "Update Valuator"
 
     expect(page).to have_content "Valuator updated successfully"
-    expect(page).to have_content @valuator.email
+    expect(page).to have_content valuator.email
     expect(page).to have_content "Valuator for health"
+    expect(page).to have_content "Can comment"
+    expect(page).not_to have_content "Can edit dossier"
   end
 
   scenario "Destroy" do
     click_link "Delete"
 
     within("#valuators") do
-      expect(page).not_to have_content(@valuator.name)
+      expect(page).not_to have_content(valuator.name)
     end
   end
 
   context "Search" do
+    let!(:user1) { create(:user, username: "David Foster Wallace", email: "david@wallace.com") }
+    let!(:user2) { create(:user, username: "Steven Erikson", email: "steven@erikson.com") }
+    let!(:valuator1) { create(:valuator, user: user1) }
+    let!(:valuator2) { create(:valuator, user: user2) }
 
     before do
-      user  = create(:user, username: "David Foster Wallace", email: "david@wallace.com")
-      user2 = create(:user, username: "Steven Erikson", email: "steven@erikson.com")
-      @valuator1 = create(:valuator, user: user)
-      @valuator2 = create(:valuator, user: user2)
       visit admin_valuators_path
     end
 
     scenario "returns no results if search term is empty" do
-      expect(page).to have_content(@valuator1.name)
-      expect(page).to have_content(@valuator2.name)
+      expect(page).to have_content(valuator1.name)
+      expect(page).to have_content(valuator2.name)
 
       fill_in "name_or_email", with: " "
       click_button "Search"
 
       expect(page).to have_content("Valuators: User search")
       expect(page).to have_content("No results found")
-      expect(page).not_to have_content(@valuator1.name)
-      expect(page).not_to have_content(@valuator2.name)
+      expect(page).not_to have_content(valuator1.name)
+      expect(page).not_to have_content(valuator2.name)
     end
 
     scenario "search by name" do
-      expect(page).to have_content(@valuator1.name)
-      expect(page).to have_content(@valuator2.name)
+      expect(page).to have_content(valuator1.name)
+      expect(page).to have_content(valuator2.name)
 
       fill_in "name_or_email", with: "Foster"
       click_button "Search"
 
       expect(page).to have_content("Valuators: User search")
-      expect(page).to have_content(@valuator1.name)
-      expect(page).not_to have_content(@valuator2.name)
+      expect(page).to have_content(valuator1.name)
+      expect(page).not_to have_content(valuator2.name)
     end
 
     scenario "search by email" do
-      expect(page).to have_content(@valuator1.email)
-      expect(page).to have_content(@valuator2.email)
+      expect(page).to have_content(valuator1.email)
+      expect(page).to have_content(valuator2.email)
 
-      fill_in "name_or_email", with: @valuator2.email
+      fill_in "name_or_email", with: valuator2.email
       click_button "Search"
 
       expect(page).to have_content("Valuators: User search")
-      expect(page).to have_content(@valuator2.email)
-      expect(page).not_to have_content(@valuator1.email)
+      expect(page).to have_content(valuator2.email)
+      expect(page).not_to have_content(valuator1.email)
     end
   end