<%= user.full_name %>
- <% end %> +<%= user.full_name %>
+ <% end %> +<%= - mail_to(user.email, encode: "hex") - %>
-<%= + mail_to(user.email, encode: "hex") + %>
+<%= - link_to( - twitter_username(user), - twitter_url(user) - ) - %>
-<%= + link_to( + twitter_username(user), + twitter_url(user) + ) + %>
+<%= membership.organization.name %>
+ <%= c.list_item_to(organization_path(membership.organization)) do %> +<%= membership.organization.name %>
+<%= membership.organization.handle %>
+<%= membership.role %>
<%= organization.handle %>
++ + <%= icon_tag("organizations", size: 6, class: "-mt-1 -ml-1 mr-1 inline-block") -%><%= t("organizations.show.organization") %> + +
+<%= membership.organization.name %>
+<%= membership.organization.handle %>
+<%= membership.role %>
+<%= membership.user.name %>
+<%= membership.role %>
+<%= t('.enter_password') %>
- <%= form.password_field :password, autocomplete: 'current-password', class: 'form__input' %> + <%= form.password_field :password, autocomplete: 'current-password', class: 'form__input', required: true %><%= short_info(gem.most_recent_version) %>
+ <%= c.list do %> + <% @subscribed_gems.each do |gem| %> + <%= c.list_item do %> +<%= short_info(gem.most_recent_version) %>
+ <% end %> + <%= button_to( + rubygem_subscription_path(gem.slug), + method: :delete, + title: t("rubygems.aside.links.unsubscribe"), + class: "h-8 w-8 ml-6 items-center justify-center outline-none -mr-2", + aria: { label: t("rubygems.aside.links.unsubscribe") } + ) do %> + <%= icon_tag "close", class: "w-6 h-6" %> + <% end %> +1.63.1
+ HTML
+ end
+ end
+ end
+ end
+ end
+end
diff --git a/test/components/previews/card_component_preview.rb b/test/components/previews/card_component_preview.rb
new file mode 100644
index 00000000000..417febf5c74
--- /dev/null
+++ b/test/components/previews/card_component_preview.rb
@@ -0,0 +1,56 @@
+class CardComponentPreview < Lookbook::Preview
+ layout "hammy_component_preview"
+
+ # @param title text "Card title"
+ # @param icon text "icon name"
+ # @param count number "count (blank for no count)"
+ # @param url url "view all link (blank for no link)"
+ def default(title: "Gems", icon: "gems", count: nil, url: nil)
+ render CardComponent.new do |c|
+ c.head(title, icon: icon, count: count, url: url)
+ c.list do
+ c.list_item { "list > list_item" }
+ end
+ end
+ end
+
+ def divided_list(title: "Gems", icon: "gems", count: nil, url: nil)
+ render CardComponent.new do |c|
+ c.head(title, icon: icon, count: count)
+ c.divided_list do
+ c.list_item { "divided_list > list_item" }
+ c.list_item_to("#") { "divided_list > list_item_to" }
+ c.list_item { "divided_list > list_item" }
+ end
+ c.list_item_to(url) { "View all" } if url
+ end
+ end
+
+ def scrollable(title: "History")
+ render CardComponent.new do |c|
+ c.head do
+ c.title(title, icon: :history)
+ end
+ c.scrollable do
+ render Card::TimelineComponent.new do |t|
+ t.timeline_item(Time.current) { "timeline_item > content" }
+ end
+ render Card::TimelineComponent.new do |t|
+ t.timeline_item(1.day.ago) { "timeline_item > content" }
+ end
+ render Card::TimelineComponent.new do |t|
+ t.timeline_item(2.days.ago) { "timeline_item > content" }
+ end
+ render Card::TimelineComponent.new do |t|
+ t.timeline_item(1.week.ago) { "timeline_item > content" }
+ end
+ render Card::TimelineComponent.new do |t|
+ t.timeline_item(1.month.ago) { "timeline_item > content" }
+ end
+ render Card::TimelineComponent.new do |t|
+ t.timeline_item(1.year.ago) { "timeline_item > content" }
+ end
+ end
+ end
+ end
+end
diff --git a/test/functional/profiles_controller_test.rb b/test/functional/profiles_controller_test.rb
index 1cfbb165ec8..0cb3ab5a29d 100644
--- a/test/functional/profiles_controller_test.rb
+++ b/test/functional/profiles_controller_test.rb
@@ -12,6 +12,19 @@ class ProfilesControllerTest < ActionController::TestCase
end
end
+ context "for a user whose email is not confirmed" do
+ setup do
+ @user = create(:user)
+ @user.update(email_confirmed: false)
+ end
+
+ should "render not found page" do
+ get :show, params: { id: @user.handle }
+
+ assert_response :not_found
+ end
+ end
+
context "when not logged in" do
setup { @user = create(:user) }
diff --git a/test/integration/i18n_test.rb b/test/integration/i18n_test.rb
index 1212f677ccd..f7a1e80fe4a 100644
--- a/test/integration/i18n_test.rb
+++ b/test/integration/i18n_test.rb
@@ -30,10 +30,12 @@ def collect_combined_keys(hash, namespace = nil)
assert_predicate reference, :present?
+ suggestion = "\nRun bin/fill-locales to add missing keys."
+
locale_keys.each do |locale, keys|
missing = reference - keys
- assert_predicate missing, :blank?, "#{locale} locale is missing: #{missing.join(', ')}"
+ assert_predicate missing, :blank?, "#{locale} locale is missing: #{missing.join(', ')}#{suggestion}"
extra = keys - reference
assert_predicate extra, :blank?, "#{locale} locale has extra: #{extra.join(', ')}"
diff --git a/test/integration/organizations/gems_test.rb b/test/integration/organizations/gems_test.rb
new file mode 100644
index 00000000000..03dbf5857cc
--- /dev/null
+++ b/test/integration/organizations/gems_test.rb
@@ -0,0 +1,25 @@
+require "test_helper"
+
+class Organizations::GemsTest < ActionDispatch::IntegrationTest
+ setup do
+ @user = create(:user, remember_token_expires_at: Gemcutter::REMEMBER_FOR.from_now)
+ post session_path(session: { who: @user.handle, password: PasswordHelpers::SECURE_TEST_PASSWORD })
+ end
+
+ test "should get index" do
+ @organization = create(:organization, owners: [@user])
+ @organization.rubygems << create(:rubygem, name: "arrakis", number: "1.0.0")
+
+ get "/organizations/#{@organization.to_param}/gems"
+
+ assert page.has_content? "arrakis"
+ end
+
+ test "should get index with no gems" do
+ @organization = create(:organization, owners: [@user])
+
+ get "/organizations/#{@organization.to_param}/gems"
+
+ assert page.has_content? "No gems yet"
+ end
+end
diff --git a/test/integration/organizations_test.rb b/test/integration/organizations_test.rb
new file mode 100644
index 00000000000..b4b3e95faf6
--- /dev/null
+++ b/test/integration/organizations_test.rb
@@ -0,0 +1,62 @@
+require "test_helper"
+
+class OrganizationsTest < ActionDispatch::IntegrationTest
+ setup do
+ @user = create(:user, remember_token_expires_at: Gemcutter::REMEMBER_FOR.from_now)
+ post session_path(session: { who: @user.handle, password: PasswordHelpers::SECURE_TEST_PASSWORD })
+ end
+
+ test "should show an organization" do
+ organization = create(:organization, owners: [@user], handle: "arrakis", name: "Arrakis")
+ organization.rubygems << create(:rubygem, name: "arrakis", number: "1.0.0")
+
+ get "/organizations/#{organization.to_param}"
+
+ assert_response :success
+ assert page.has_content? "arrakis"
+ end
+
+ test "should render not found when an organization doesn't exist" do
+ get "/organizations/notfound"
+
+ assert_response :not_found
+ end
+
+ test "should list no organization for a user with none" do
+ get "/organizations"
+
+ assert_response :success
+ end
+
+ test "should list organizations for a user" do
+ organization = create(:organization, owners: [@user])
+
+ get "/organizations"
+
+ assert_response :success
+ assert page.has_content? organization.name
+ end
+
+ test "should render organization edit form" do
+ organization = create(:organization, owners: [@user])
+
+ get "/organizations/#{organization.to_param}/edit"
+
+ assert_response :success
+ assert_select "form[action=?]", organization_path(organization)
+ assert_select "input[name=?]", "organization[name]"
+ end
+
+ test "should update an organization display name" do
+ organization = create(:organization, owners: [@user])
+
+ patch "/organizations/#{organization.to_param}", params: {
+ organization: { name: "New Name" }
+ }
+
+ assert_redirected_to organization_path(organization)
+ follow_redirect!
+
+ assert page.has_content? "New Name"
+ end
+end
diff --git a/test/integration/rubygems_test.rb b/test/integration/rubygems_test.rb
index 1fc945eed7e..4ec6796efa7 100644
--- a/test/integration/rubygems_test.rb
+++ b/test/integration/rubygems_test.rb
@@ -28,4 +28,29 @@ class RubygemsTest < ActionDispatch::IntegrationTest
assert page.has_content? "Provenance"
end
+
+ test "GET to show for a fully yanked gem as owner" do
+ user = create(:user, remember_token_expires_at: Gemcutter::REMEMBER_FOR.from_now)
+ rubygem = create(:rubygem, owners: [user], number: "1.0.0", created_at: 2.months.ago)
+ version = rubygem.versions.sole
+ user.deletions.create!(version:)
+ rubygem.reload
+
+ assert_predicate rubygem.public_versions.to_a, :empty?
+
+ get "/gems/#{rubygem.name}"
+
+ assert page.has_content? "This gem previously existed, but has been removed by its owner."
+ refute page.has_link? "Owners"
+ refute page.has_link? "Trusted publishers"
+ refute page.has_link? "Security Events"
+
+ post session_path(session: { who: user.handle, password: PasswordHelpers::SECURE_TEST_PASSWORD })
+
+ get "/gems/#{rubygem.name}"
+
+ assert page.has_link? "Owners"
+ assert page.has_link? "Trusted publishers"
+ assert page.has_link? "Security Events"
+ end
end
diff --git a/test/policies/api/nil_class_policy_test.rb b/test/policies/api/nil_class_policy_test.rb
new file mode 100644
index 00000000000..3472f8c9147
--- /dev/null
+++ b/test/policies/api/nil_class_policy_test.rb
@@ -0,0 +1,21 @@
+require "test_helper"
+
+class Api::NilClassPolicyTest < ApiPolicyTestCase
+ def policy!(api_key)
+ Pundit.policy!(api_key, [:api, nil])
+ end
+
+ context "::Scope.resolve" do
+ should "raise" do
+ assert_raises Pundit::NotDefinedError do
+ Api::NilClassPolicy::Scope.new(nil, nil).resolve
+ end
+ end
+ end
+
+ context "#destroy?" do
+ should "not be authorized" do
+ refute_authorized policy!(nil), :destroy?, "Forbidden"
+ end
+ end
+end
diff --git a/test/policies/membership_policy_test.rb b/test/policies/membership_policy_test.rb
index cc3e3465a3c..39a383f707e 100644
--- a/test/policies/membership_policy_test.rb
+++ b/test/policies/membership_policy_test.rb
@@ -96,26 +96,24 @@ def policy!(user, record = Membership)
context "removing owner" do
should "be authorized for org owners only" do
membership = create(:membership, :owner, organization: @organization)
- membership.role = :admin
- assert_authorized policy!(@owner, membership), :update?
+ assert_authorized policy!(@owner, membership), :destroy?
- refute_authorized policy!(@admin, membership), :update?
- refute_authorized policy!(@maintainer, membership), :update?
- refute_authorized policy!(@guest, membership), :update?
+ refute_authorized policy!(@admin, membership), :destroy?
+ refute_authorized policy!(@maintainer, membership), :destroy?
+ refute_authorized policy!(@guest, membership), :destroy?
end
end
context "removing admin" do
should "be authorized for org admins and owners" do
membership = create(:membership, :admin, organization: @organization)
- membership.role = :maintainer
- assert_authorized policy!(@owner, membership), :update?
- assert_authorized policy!(@admin, membership), :update?
+ assert_authorized policy!(@owner, membership), :destroy?
+ assert_authorized policy!(@admin, membership), :destroy?
- refute_authorized policy!(@maintainer, membership), :update?
- refute_authorized policy!(@guest, membership), :update?
+ refute_authorized policy!(@maintainer, membership), :destroy?
+ refute_authorized policy!(@guest, membership), :destroy?
end
end
end
diff --git a/test/policies/rubygem_policy_test.rb b/test/policies/rubygem_policy_test.rb
index 4979fa27697..505dc93a4fd 100644
--- a/test/policies/rubygem_policy_test.rb
+++ b/test/policies/rubygem_policy_test.rb
@@ -33,6 +33,14 @@ def org_policy!(user)
Pundit.policy!(user, @org_rubygem)
end
+ context "#create?" do
+ should "allow users" do
+ assert_authorized policy!(@owner), :create?
+ assert_authorized policy!(@user), :create?
+ refute_authorized policy!(nil), :create?
+ end
+ end
+
context "#configure_oidc?" do
should "only allow the owner" do
assert_authorized policy!(@owner), :configure_oidc?
diff --git a/test/system/profile_test.rb b/test/system/profile_test.rb
new file mode 100644
index 00000000000..5afb8195384
--- /dev/null
+++ b/test/system/profile_test.rb
@@ -0,0 +1,38 @@
+require "application_system_test_case"
+require "test_helper"
+
+class ProfileTest < ApplicationSystemTestCase
+ setup do
+ @user = create(:user, email: "nick@example.com", password: PasswordHelpers::SECURE_TEST_PASSWORD, handle: "nick1", mail_fails: 1)
+ end
+
+ def sign_in
+ visit sign_in_path
+ fill_in "Email or Username", with: @user.reload.email
+ fill_in "Password", with: @user.password
+ click_button "Sign in"
+ end
+
+ test "adding X(formerly Twitter) username without filling in your password" do
+ twitter_username = "nick1twitter"
+
+ sign_in
+ visit profile_path("nick1")
+
+ click_link "Edit Profile"
+ fill_in "user_twitter_username", with: twitter_username
+
+ assert_equal twitter_username, page.find_by_id("user_twitter_username").value
+
+ click_button "Update"
+
+ # Verify that the newly added Twitter username is still on the form so that the user does not need to re-enter it
+ assert_equal twitter_username, page.find_by_id("user_twitter_username").value
+
+ fill_in "Password", with: PasswordHelpers::SECURE_TEST_PASSWORD
+ click_button "Update"
+
+ assert page.has_content? "Your profile was updated."
+ assert_equal twitter_username, page.find_by_id("user_twitter_username").value
+ end
+end
diff --git a/test/views/card/timeline_component_test.rb b/test/views/card/timeline_component_test.rb
new file mode 100644
index 00000000000..8357c0be118
--- /dev/null
+++ b/test/views/card/timeline_component_test.rb
@@ -0,0 +1,16 @@
+require "test_helper"
+
+class Card::TimelineComponentTest < ComponentTest
+ should "render timeline item without link to user" do
+ datetime = 1.2.days.ago
+
+ render Card::TimelineComponent.new do |c|
+ c.timeline_item(datetime) do
+ "additional content"
+ end
+ end
+
+ assert_selector "time[datetime='#{datetime.iso8601}']"
+ assert_text "additional content"
+ end
+end
diff --git a/test/views/card_component_test.rb b/test/views/card_component_test.rb
new file mode 100644
index 00000000000..a36daccf46f
--- /dev/null
+++ b/test/views/card_component_test.rb
@@ -0,0 +1,44 @@
+require "test_helper"
+
+class CardComponentTest < ComponentTest
+ def render(...)
+ response = super
+ Capybara.string(response)
+ end
+
+ should "render a card with title, icon, and list content" do
+ render CardComponent.new do |c|
+ c.head("Gems", icon: "gems", count: 3)
+ c.list do
+ c.list_item_to("rubygem_version_path(1)") { "RubyGem1 (0.0.1)" }
+ c.list_item_to("rubygem_version_path(2)") { "RubyGem2 (0.0.2)" }
+ c.list_item_to("rubygem_version_path(3)") { "RubyGem3 (0.0.3)" }
+ end
+ end
+
+ assert_selector "article"
+ assert_selector "h3", text: "Gems"
+ assert_selector "svg.fill-orange"
+ assert_selector "span", text: "3"
+ assert_link "RubyGem1 (0.0.1)", href: "rubygem_version_path(1)"
+ assert_link "RubyGem2 (0.0.2)", href: "rubygem_version_path(2)"
+ assert_link "RubyGem3 (0.0.3)", href: "rubygem_version_path(3)"
+ refute_text "View all"
+ end
+
+ should "render a card with custom title and scrollable content" do
+ render CardComponent.new do |c|
+ c.head do
+ c.title("History")
+ end
+ c.scrollable do
+ "content"
+ end
+ end
+
+ assert_selector "article"
+ assert_selector "h3", text: "History"
+ assert_text "content"
+ refute_text "View all"
+ end
+end