Merge pull request #4614 from consul/dependabot/bundler/master/cancancan-3.3.0

Bump cancancan from 2.3.0 to 3.3.0

Gemfile

@@ -9,7 +9,7 @@ gem "airbrake", "~> 7.4.0"
 gem "ancestry", "~> 3.2.1"
 gem "audited", "~> 5.0.1"
 gem "autoprefixer-rails", "~> 8.2.0"
-gem "cancancan", "~> 2.3.0"
+gem "cancancan", "~> 3.3.0"
 gem "caxlsx", "~> 3.0.2"
 gem "caxlsx_rails", "~> 0.6.2"
 gem "ckeditor", "~> 4.3.0"

Gemfile.lock

@@ -95,7 +95,7 @@ GEM
       activesupport (>= 3.0.0)
       uniform_notifier (~> 1.11)
     byebug (11.1.3)
-    cancancan (2.3.0)
+    cancancan (3.3.0)
     capistrano (3.16.0)
       airbrussh (>= 1.0.0)
       i18n
@@ -711,7 +711,7 @@ DEPENDENCIES
   autoprefixer-rails (~> 8.2.0)
   bullet (~> 6.1.4)
   byebug (~> 11.1.3)
-  cancancan (~> 2.3.0)
+  cancancan (~> 3.3.0)
   capistrano (~> 3.16.0)
   capistrano-bundler (~> 2.0)
   capistrano-rails (~> 1.6.1)

spec/system/budgets/investments_spec.rb

@@ -657,7 +657,7 @@ describe "Budget Investments" do
     end
 
     scenario "Another User can't edit budget investment", :admin do
-      message_error = "You do not have permission to carry out the action 'edit' on budget/investment"
+      message_error = "You do not have permission to carry out the action 'edit' on Investment"
       daniel = create(:user, :level_two)
       investment = create(:budget_investment, heading: heading, author: daniel)
 

spec/system/debates_spec.rb

@@ -321,7 +321,7 @@ describe "Debates" do
     visit edit_debate_path(debate)
     expect(page).not_to have_current_path(edit_debate_path(debate))
     expect(page).to have_current_path(root_path)
-    expect(page).to have_content "You do not have permission to carry out the action 'edit' on debate."
+    expect(page).to have_content "You do not have permission to carry out the action 'edit' on Debate."
   end
 
   scenario "Update should not be posible if debate is not editable" do

spec/system/polls/polls_spec.rb

@@ -499,10 +499,10 @@ describe "Polls" do
       expect(page).not_to have_content("Participation statistics")
 
       visit results_poll_path(poll)
-      expect(page).to have_content("You do not have permission to carry out the action 'results' on poll.")
+      expect(page).to have_content("You do not have permission to carry out the action 'results' on Poll.")
 
       visit stats_poll_path(poll)
-      expect(page).to have_content("You do not have permission to carry out the action 'stats' on poll.")
+      expect(page).to have_content("You do not have permission to carry out the action 'stats' on Poll.")
     end
 
     scenario "Do not show poll results or stats to admins if disabled", :admin do
@@ -525,10 +525,10 @@ describe "Polls" do
       expect(page).not_to have_content("Participation statistics")
 
       visit results_poll_path(poll)
-      expect(page).to have_content("You do not have permission to carry out the action 'results' on poll.")
+      expect(page).to have_content("You do not have permission to carry out the action 'results' on Poll.")
 
       visit stats_poll_path(poll)
-      expect(page).to have_content("You do not have permission to carry out the action 'stats' on poll.")
+      expect(page).to have_content("You do not have permission to carry out the action 'stats' on Poll.")
     end
 
     scenario "Generates navigation links for polls without a slug" do

spec/system/topics_spec.rb

@@ -71,7 +71,7 @@ describe "Topics" do
 
       visit new_community_topic_path(community)
 
-      expect(page).to have_content "You do not have permission to carry out the action 'new' on topic."
+      expect(page).to have_content "You do not have permission to carry out the action 'new' on Topic."
     end
   end
 
@@ -101,7 +101,7 @@ describe "Topics" do
 
       visit edit_community_topic_path(community, topic)
 
-      expect(page).to have_content "You do not have permission to carry out the action 'edit' on topic."
+      expect(page).to have_content "You do not have permission to carry out the action 'edit' on Topic."
     end
   end