<% flash.each do |message_type, message| %>
<%= render(AlertComponent.new(message_type: message_type, message: message) ) %>
<% end %>
diff --git a/app/views/registrations/new.html.erb b/app/views/registrations/new.html.erb
index 3ff629e9..6b847a5b 100644
--- a/app/views/registrations/new.html.erb
+++ b/app/views/registrations/new.html.erb
@@ -1,13 +1,6 @@
-<%= form_with url: "/signup", method: :post, model: @user do |form| %>
-
- <%= form.label :name %>
- <%= form.text_field :name %>
- <%= form.label :email %>
- <%= form.text_field :email %>
- <%= form.label :password %>
- <%= form.password_field :password %>
- <%= form.label :password_confirmation %>
- <%= form.password_field :password_confirmation %>
-
- <%= form.submit 'Signup' %>
+<%= primer_form_with local: true, model: @user, url: signup_path do |f| %>
+ <%= render(Primer::Box.new(m: 3)) do %>
+ <%= render(SignupForm.new(f)) %>
+ <% end %>
<% end %>
+
diff --git a/app/views/sessions/new.html.erb b/app/views/sessions/new.html.erb
index ecd032d8..c5e9e572 100644
--- a/app/views/sessions/new.html.erb
+++ b/app/views/sessions/new.html.erb
@@ -1,9 +1,5 @@
-<%= form_with local: true, url: sessions_path do |form| %>
-
- <%= form.label :email %>
- <%= form.text_field :email %>
- <%= form.label :password %>
- <%= form.password_field :password %>
-
- <%= form.submit 'Login' %>
+<%= primer_form_with local: true, url: sessions_path do |f| %>
+ <%= render(Primer::Box.new(m: 3)) do %>
+ <%= render(LoginForm.new(f)) %>
+ <% end %>
<% end %>
diff --git a/config/application.rb b/config/application.rb
index 52caabcc..a29ebf87 100644
--- a/config/application.rb
+++ b/config/application.rb
@@ -2,6 +2,9 @@
require "rails/all"
+require "view_component"
+require "primer/view_components"
+
# Require the gems listed in Gemfile, including any gems
# you've limited to :test, :development, or :production.
Bundler.require(*Rails.groups)
diff --git a/config/credentials.yml.enc b/config/credentials.yml.enc
deleted file mode 100644
index 55c427ad..00000000
--- a/config/credentials.yml.enc
+++ /dev/null
@@ -1 +0,0 @@
-e3qEqsxR38wpJ3N3DdGb0bTHkuqZFav4wohdbw+TkhDWYN+7aVg2EDIMjzMdwj4Ln18H/O1tzw9x8Z+KVYakL4+TH5p4jH+W1Z06yp8lPDIK8AugJnxTS488fFfR95OkqScLKS8FCf/kO37A0u3fiJnqIBujOW2qqTRZr4pYTHIiNX1II6G2VgUeuKppf4nXqVInw+3iEAtG9Pkw/PA6kioWOkPe64PoMrA2L6569CzgauBnGMKiOCTCgkNbB/SmeULqEV/+DgnT6MLu1ji9oGwrad1P1kLdWzurc+dkgJpHRo4FqWaVLbLVdNAe1H+3l6G2TMVFBfXLetl+4BDYs6lk+GZlItR6Lwt0NxRe/aRIdmlLyjwaYAUmK8V+aOPEHpHmrry/dNiKLPyZd0ZDCeksvkTy0pGbwmlk--egkZdlyGazur1xGm--gjnXVCoP9JSJu2EKGWFUvA==
\ No newline at end of file
diff --git a/config/environments/test.rb b/config/environments/test.rb
index 6ea4d1e7..47d7bb85 100644
--- a/config/environments/test.rb
+++ b/config/environments/test.rb
@@ -10,6 +10,7 @@
# Turn false under Spring and add config.action_view.cache_template_loading = true.
config.cache_classes = true
+ config.action_view.cache_template_loading = true
# Eager loading loads your whole application. When running a single test locally,
# this probably isn't necessary. It's a good idea to do in a continuous integration
@@ -57,4 +58,10 @@
# Annotate rendered view with file names.
# config.action_view.annotate_rendered_view_with_filenames = true
+
+ config.assets.css_compressor = nil
+
+ # config.action_view.raise_on_missing_translations = true
+ config.primer_view_components.silence_deprecations = true
+ config.primer_view_components.raise_on_invalid_options = true
end
diff --git a/db/schema.rb b/db/schema.rb
index 95f93e9f..bca6f084 100644
--- a/db/schema.rb
+++ b/db/schema.rb
@@ -10,7 +10,7 @@
#
# It's strongly recommended that you check this file into your version control system.
-ActiveRecord::Schema[8.0].define(version: 2022_05_12_122510) do
+ActiveRecord::Schema[7.2].define(version: 2022_05_12_122510) do
# These are extensions that must be enabled in order to support this database
enable_extension "plpgsql"
diff --git a/spec/components/alert_component_spec.rb b/spec/components/alert_component_spec.rb
index 6a8d1c3a..611480ad 100644
--- a/spec/components/alert_component_spec.rb
+++ b/spec/components/alert_component_spec.rb
@@ -5,17 +5,23 @@
RSpec.describe AlertComponent, type: :component do
it 'render success alert' do
render_inline(
- described_class.new(message_type: "notice", message: "success message")
+ described_class.new(message_type: "success", message: "success message")
)
- expect(page).to have_selector ".alert-success", text: "success message"
- expect(page).not_to have_selector ".alert-danger"
+ expect(page).to have_selector ".flash-success", text: "success message"
+ expect(page).not_to have_selector ".flash-warning"
+ end
+
+ it 'render warning alert' do
+ render_inline(
+ described_class.new(message_type: "warning", message: "warning message")
+ )
+ expect(page).to have_selector ".flash-warn", text: "warning message"
end
it 'render danger alert' do
render_inline(
- described_class.new(message_type: "alert", message: "danger message")
+ described_class.new(message_type: "danger", message: "danger message")
)
- expect(page).to have_selector ".alert-danger", text: "danger message"
- expect(page).not_to have_selector ".alert-success"
+ expect(page).to have_selector ".flash-error", text: "danger message"
end
end
diff --git a/spec/system/registrations_spec.rb b/spec/system/registrations_spec.rb
index 1b5b1fd0..c3335105 100644
--- a/spec/system/registrations_spec.rb
+++ b/spec/system/registrations_spec.rb
@@ -8,7 +8,7 @@
fill_in :user_email, with: email
fill_in :user_password, with: password
fill_in :user_password_confirmation, with: password
- click_on 'Signup'
+ click_on '登録'
end
context "when all in information" do
@@ -17,7 +17,7 @@
let(:password) { "test1234" }
it "succeed to signup with message" do
- within "div.alert-success" do
+ within "div.flash-success" do
expect(page).to have_content("ユーザー登録しました")
end
end
@@ -29,7 +29,7 @@
let(:password) { "" }
it "fails to signup with alert message" do
- within "div.alert-danger" do
+ within "div.flash-warn" do
expect(page).to have_content("Password を入力してください")
expect(page).to have_content("Email を入力してください")
expect(page).to have_content("Email の形式が不正です")
diff --git a/spec/system/sessions_spec.rb b/spec/system/sessions_spec.rb
index 64c073bb..0b176aba 100644
--- a/spec/system/sessions_spec.rb
+++ b/spec/system/sessions_spec.rb
@@ -8,7 +8,7 @@
visit "/login"
fill_in :email, with: email
fill_in :password, with: password
- click_on 'Login'
+ find(".Button", :text => "ログイン").click
end
context "when both email and password are correct" do
@@ -16,7 +16,7 @@
let(:password) { user.password }
it "enables us to login with email and password" do
- within "div.alert-success" do
+ within "div.flash-success" do
expect(page).to have_content("ログインに成功しました")
end
end
@@ -27,7 +27,7 @@
let(:password) { user.password }
it "fails to login with alert message" do
- within "div.alert-danger" do
+ within "div.flash-warn" do
expect(page).to have_content("ログインに失敗しました")
end
end
@@ -38,7 +38,7 @@
let(:password) { 'wrong_password' }
it "fails to login with alert message" do
- within "div.alert-danger" do
+ within "div.flash-warn" do
expect(page).to have_content("ログインに失敗しました")
end
end