From 7c7bdf7e65ba27174cb6ab380a861f5eb09efa4c Mon Sep 17 00:00:00 2001 From: Runar Ingebrigtsen Date: Fri, 30 Jan 2026 01:47:41 +0100 Subject: [PATCH] lint this, check todo --- app/controllers/admin/requests_controller.rb | 2 +- app/models/entry.rb | 2 +- config/routes.rb | 2 +- docs/TODO.md | 2 +- test/controllers/requests_controller_test.rb | 10 +++++----- test/integration/entry_request_flow_test.rb | 4 ++-- 6 files changed, 11 insertions(+), 11 deletions(-) diff --git a/app/controllers/admin/requests_controller.rb b/app/controllers/admin/requests_controller.rb index bc2df29..af5572b 100644 --- a/app/controllers/admin/requests_controller.rb +++ b/app/controllers/admin/requests_controller.rb @@ -48,7 +48,7 @@ class Admin::RequestsController < Admin::BaseController @entry = Entry.find(params[:id]) @user = @entry.requested_by - entry_preview = [@entry.fi, @entry.en, @entry.sv, @entry.no, @entry.ru, @entry.de].compact.first || "Entry" + entry_preview = [ @entry.fi, @entry.en, @entry.sv, @entry.no, @entry.ru, @entry.de ].compact.first || "Entry" @entry.destroy! @user.destroy! if @user.requested_entries.count.zero? diff --git a/app/models/entry.rb b/app/models/entry.rb index c3c9d46..6562576 100644 --- a/app/models/entry.rb +++ b/app/models/entry.rb @@ -51,7 +51,7 @@ class Entry < ApplicationRecord end def at_least_one_translation - if [fi, en, sv, no, ru, de].all?(&:blank?) + if [ fi, en, sv, no, ru, de ].all?(&:blank?) errors.add(:base, "At least one language translation is required") end end diff --git a/config/routes.rb b/config/routes.rb index 2c82939..c00f110 100644 --- a/config/routes.rb +++ b/config/routes.rb @@ -26,7 +26,7 @@ Rails.application.routes.draw do patch "invitations/:token/accept", to: "invitations#update", as: :accept_invitation # Public entry request routes - resources :requests, only: [:new, :create] + resources :requests, only: [ :new, :create ] # Admin namespace namespace :admin do diff --git a/docs/TODO.md b/docs/TODO.md index 1dbe1f9..40e412e 100644 --- a/docs/TODO.md +++ b/docs/TODO.md @@ -63,7 +63,7 @@ - [ ] **Notifications** when suggestions are reviewed ### Comments & Discussion -- [ ] **Add comment** form on entry view +- [x] **Add comment** form on entry view - [ ] **Edit/delete own comments** - [ ] **Comment threading** (optional: replies to comments) - [ ] **Comment notifications** for entry contributors diff --git a/test/controllers/requests_controller_test.rb b/test/controllers/requests_controller_test.rb index 825b653..da35086 100644 --- a/test/controllers/requests_controller_test.rb +++ b/test/controllers/requests_controller_test.rb @@ -25,7 +25,7 @@ class RequestsControllerTest < ActionDispatch::IntegrationTest end test "should create entry request with valid data" do - assert_difference(["User.count", "Entry.count"], 1) do + assert_difference([ "User.count", "Entry.count" ], 1) do post requests_path, params: { entry: { name: "New Requester", @@ -52,7 +52,7 @@ class RequestsControllerTest < ActionDispatch::IntegrationTest end test "should require at least one translation" do - assert_no_difference(["User.count", "Entry.count"]) do + assert_no_difference([ "User.count", "Entry.count" ]) do post requests_path, params: { entry: { name: "New Requester", @@ -70,7 +70,7 @@ class RequestsControllerTest < ActionDispatch::IntegrationTest test "should redirect to login if email already exists" do existing_user = users(:contributor_user) - assert_no_difference(["User.count", "Entry.count"]) do + assert_no_difference([ "User.count", "Entry.count" ]) do post requests_path, params: { entry: { name: "Test User", @@ -96,7 +96,7 @@ class RequestsControllerTest < ActionDispatch::IntegrationTest end test "should create entry with only one translation" do - assert_difference(["User.count", "Entry.count"], 1) do + assert_difference([ "User.count", "Entry.count" ], 1) do post requests_path, params: { entry: { name: "Single Translation", @@ -115,7 +115,7 @@ class RequestsControllerTest < ActionDispatch::IntegrationTest end test "should create entry with multiple translations" do - assert_difference(["User.count", "Entry.count"], 1) do + assert_difference([ "User.count", "Entry.count" ], 1) do post requests_path, params: { entry: { name: "Multi Lingual", diff --git a/test/integration/entry_request_flow_test.rb b/test/integration/entry_request_flow_test.rb index 21a3b78..d5bc59a 100644 --- a/test/integration/entry_request_flow_test.rb +++ b/test/integration/entry_request_flow_test.rb @@ -3,7 +3,7 @@ require "test_helper" class EntryRequestFlowTest < ActionDispatch::IntegrationTest test "complete flow: request -> admin approve -> user accepts -> entry active" do # Step 1: Public user submits entry request - assert_difference(["User.count", "Entry.count"], 1) do + assert_difference([ "User.count", "Entry.count" ], 1) do post requests_path, params: { entry: { name: "Flow Test User", @@ -110,7 +110,7 @@ class EntryRequestFlowTest < ActionDispatch::IntegrationTest # Admin rejects it login_as(users(:admin_user)) - assert_difference(["User.count", "Entry.count"], -1) do + assert_difference([ "User.count", "Entry.count" ], -1) do delete reject_admin_request_path(entry) end