Fix more specs

draghtnight · Mar 10, 2023 · a2b9751 · a2b9751
1 parent 5406b1b
commit a2b9751
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 1 deletion.
diff --git a/app/controllers/users_controller.rb b/app/controllers/users_controller.rb
@@ -12,7 +12,7 @@ def index
   def show
     @user      = User.find_by_nickname!(params[:id])
     @calendar  = Calendar.new(Gift.giftable_dates(current_year), @user.gifts.year(current_year))
-    @merged_contributions = @user.merged_contributions.year(current_year).latest(nil)
+    @merged_contributions = @user.merged_contributions.excluding_organisations(@user.ignored_organisations).year(current_year).latest(nil)
     respond_with @user
   end
 

diff --git a/spec/requests/projects_spec.rb b/spec/requests/projects_spec.rb
@@ -79,6 +79,7 @@
         30.times do |i|
           create :project, name: "Ruby project #{i}", main_language: 'Ruby'
         end
+        Project.count
         visit projects_path
 
         click_on 'More'