|
- <% if user.avatar.present? %>
- <%= image_tag url_for(user.avatar), class: "w-10 h-10 rounded-full object-cover border border-gray-300 shadow-sm mx-auto" %>
+ <% if user.facilitator %>
+ <%= facilitator_profile_button(user.facilitator) %>
<% else %>
- <%= image_tag "missing.png", class: "w-10 h-10 rounded-full object-cover border border-dashed border-gray-300 mx-auto" %>
+ <%= link_to "Create facilitator",
+ new_facilitator_path(user_id: user.id),
+ class: "btn btn-secondary-outline" %>
<% end %>
|
-
- <%= user.first_name %> |
-
-
- <%= user.last_name %> |
-
<%= user.email %> |
-
-
- <% if user.projects.any? %>
- <% user_project_names = user.projects.map(&:name).join(", ") %>
-
- <%= truncate(user_project_names, length: 60) %>
-
- <% else %>
- --
- <% end %>
- |
-
-
-
- <% if user.phone.present? %>
- <%= user.phone %>
- <% else %>
- --
- <% end %>
- |
-
<% if user.inactive? %>
diff --git a/app/views/workshops/_index_row.html.erb b/app/views/workshops/_index_row.html.erb
index 0a797923a..5918cc5b0 100644
--- a/app/views/workshops/_index_row.html.erb
+++ b/app/views/workshops/_index_row.html.erb
@@ -46,7 +46,8 @@
<%= link_to link_route,
class: "hover:underline block",
data: { turbo: false } do %>
- <%= title_with_badges(workshop, admin: current_user.super_user?, display_windows_type: true).html_safe %>
+ <%= title_with_badges(workshop, show_hidden_badge: current_user.super_user?,
+ display_windows_type: true).html_safe %>
<% end %>
diff --git a/spec/factories/users.rb b/spec/factories/users.rb
index a1c41add5..845a5134b 100644
--- a/spec/factories/users.rb
+++ b/spec/factories/users.rb
@@ -46,6 +46,10 @@
super_user { true }
end
+ trait :with_facilitator do
+ facilitator { association :facilitator, user: instance }
+ end
+
trait :orphaned_reports do
email { "orphaned_reports@awbw.org" }
super_user { true }
diff --git a/spec/models/facilitator_spec.rb b/spec/models/facilitator_spec.rb
index b75e35532..e8dde26d1 100644
--- a/spec/models/facilitator_spec.rb
+++ b/spec/models/facilitator_spec.rb
@@ -11,8 +11,7 @@
end
describe "#name" do
- let(:user) { build(:user, first_name: "Jane", last_name: "Doe") }
- let(:facilitator) { build(:facilitator, user: user) }
+ let(:facilitator) { build(:facilitator, first_name: "Jane", last_name: "Doe") }
context "when display_name_preference is full_name" do
it "returns the full name" do
diff --git a/spec/views/facilitators/index.html.erb_spec.rb b/spec/views/facilitators/index.html.erb_spec.rb
index f176ef114..be5cfa0d4 100644
--- a/spec/views/facilitators/index.html.erb_spec.rb
+++ b/spec/views/facilitators/index.html.erb_spec.rb
@@ -1,7 +1,6 @@
require 'rails_helper'
RSpec.describe "facilitators/index", type: :view do
- let(:user) { create(:user) }
let(:admin) { create(:user, :admin) }
let(:facilitator) { create(:facilitator)}
@@ -9,12 +8,12 @@
before(:each) do
assign(:facilitators, paginated([facilitator, facilitator_2]))
- allow(view).to receive(:current_user).and_return(user)
+ allow(view).to receive(:current_user).and_return(admin)
end
it "renders a list of facilitators" do
render
- expect(rendered).to match(facilitator.user.first_name)
- expect(rendered).to match(facilitator_2.user.first_name)
+ expect(rendered).to match(facilitator.first_name)
+ expect(rendered).to match(facilitator_2.first_name)
end
end
diff --git a/spec/views/facilitators/show.html.erb_spec.rb b/spec/views/facilitators/show.html.erb_spec.rb
index f97aeadcd..9a6270168 100644
--- a/spec/views/facilitators/show.html.erb_spec.rb
+++ b/spec/views/facilitators/show.html.erb_spec.rb
@@ -1,20 +1,19 @@
require 'rails_helper'
RSpec.describe "facilitators/show", type: :view do
- let(:user) { create(:user) }
let(:admin) { create(:user, :admin) }
let(:facilitator) { create(:facilitator)}
before do
assign(:facilitator, facilitator.decorate)
- allow(view).to receive(:current_user).and_return(user)
+ allow(view).to receive(:current_user).and_return(admin)
render
end
it "renders attributes" do
- expect(rendered).to match(facilitator.user.first_name)
- expect(rendered).to match(facilitator.user.last_name)
+ expect(rendered).to match(facilitator.first_name)
+ expect(rendered).to match(facilitator.last_name)
expect(rendered).to match(facilitator.user.email)
end
end
diff --git a/spec/views/users/index.html.erb_spec.rb b/spec/views/users/index.html.erb_spec.rb
index e2b2be735..f13bebf7a 100644
--- a/spec/views/users/index.html.erb_spec.rb
+++ b/spec/views/users/index.html.erb_spec.rb
@@ -1,21 +1,83 @@
-require 'rails_helper'
+require "rails_helper"
RSpec.describe "users/index", type: :view do
- let(:admin_user) { create(:user, :admin) } # or super_user trait
+ let(:admin_user) { create(:user, :admin) }
- before(:each) do
- allow(view).to receive(:current_user).and_return(admin_user) # Stub current_user for Devise
- users = create_list(:user, 3, first_name: "Alice")
- paginated_users = WillPaginate::Collection.create(1, 10, users.size) do |pager|
- pager.replace(users)
+ before do
+ allow(view).to receive(:current_user).and_return(admin_user)
+ end
+
+ context "when users have facilitators" do
+ before do
+ @users = create_list(:user, 2, :with_facilitator) # Factory should build facilitator + avatar if needed
+
+ paginated = WillPaginate::Collection.create(1, 10, @users.size) do |pager|
+ pager.replace(@users)
+ end
+
+ assign(:users, paginated)
+ assign(:users_count, @users.size)
+ end
+
+ it "renders facilitator profile buttons instead of 'Create facilitator'" do
+ render
+
+ # Two rows
+ expect(rendered).to have_selector("table tbody tr", count: 2)
+
+ @users.each do |user|
+ facilitator = user.facilitator
+
+ # The helper output (button) must appear
+ expect(rendered).to include(facilitator.name)
+
+ # Should NOT show "Create facilitator"
+ expect(rendered).not_to include("Create facilitator")
+ end
end
- assign(:users, paginated_users)
end
- it "renders a list of users" do
- render
+ context "when a user has NO facilitator" do
+ let!(:user_without_facilitator) { create(:user) }
+
+ before do
+ paginated = WillPaginate::Collection.create(1, 10, 1) do |pager|
+ pager.replace([user_without_facilitator])
+ end
- assert_select "table tbody tr", count: 3
- assert_select "table tbody tr td", text: /Alice/
+ assign(:users, paginated)
+ assign(:users_count, 1)
+ end
+
+ it "shows 'Create facilitator' button" do
+ render
+
+ expect(rendered).to include("Create facilitator")
+ expect(rendered).to have_link(
+ "Create facilitator",
+ href: new_facilitator_path(user_id: user_without_facilitator.id)
+ )
+ end
+ end
+
+ context "general index behavior" do
+ before do
+ users = create_list(:user, 3)
+
+ paginated = WillPaginate::Collection.create(1, 10, users.size) do |pager|
+ pager.replace(users)
+ end
+
+ assign(:users, paginated)
+ assign(:users_count, users.size)
+ end
+
+ it "renders correct table structure" do
+ render
+
+ expect(rendered).to have_selector("table thead tr th", text: "Name")
+ expect(rendered).to have_selector("table thead tr th", text: "Email")
+ expect(rendered).to have_selector("table tbody tr", count: 3)
+ end
end
end
|