Commit 2232576e by Đường Sỹ Hoàng

Fixed coding styles

parent 260d8e87
......@@ -8,7 +8,7 @@ class SessionsController < ApplicationController
if @user && @user.authenticate(params[:session][:password])
if @user.activated?
log_in @user
params[:session][:remember_me] == '1' ? remember(@user) : forget(@user)
params[:session][:remember_me] == "1" ? remember(@user) : forget(@user)
redirect_back_or @user
else
message = "Account not activated. "
......
......@@ -5,7 +5,6 @@ class UsersController < ApplicationController
def index
@users = User.where(activated: true).paginate(page: params[:page])
end
def show
......
class UserMailer < ApplicationMailer
def account_activation(user)
@user = user
mail to: user.email, subject: "Account activation"
......
......@@ -73,4 +73,3 @@ class User < ApplicationRecord
self.activation_digest = User.digest(activation_token)
end
end
......@@ -24,9 +24,7 @@ Rails.application.configure do
if Rails.root.join("tmp/caching-dev.txt").exist?
config.action_controller.perform_caching = true
config.cache_store = :memory_store
config.public_file_server.headers = {
"Cache-Control" => "public, max-age=#{2.days.seconds.to_i}"
}
config.public_file_server.headers = { "Cache-Control" => "public, max-age=#{2.days.seconds.to_i}" }
else
config.action_controller.perform_caching = false
config.cache_store = :null_store
......
Rails.application.routes.draw do
root "static_pages#home"
get "/help", to: "static_pages#help"
get "/about", to: "static_pages#about"
get "/contact", to: "static_pages#contact"
get "/signup", to: "users#new"
get "/login", to: "sessions#new"
post "/login", to: "sessions#create"
delete "/logout", to: "sessions#destroy"
get "/help", to: "static_pages#help"
get "/about", to: "static_pages#about"
get "/contact", to: "static_pages#contact"
get "/signup", to: "users#new"
get "/login", to: "sessions#new"
post "/login", to: "sessions#create"
delete "/logout", to: "sessions#destroy"
resources :users
resources :account_activations, only: [:edit]
end
......@@ -11,7 +11,6 @@
# It's strongly recommended that you check this file into your version control system.
ActiveRecord::Schema.define(version: 20191119063621) do
create_table "users", force: :cascade do |t|
t.string "name"
t.string "email"
......@@ -25,5 +24,4 @@ ActiveRecord::Schema.define(version: 20191119063621) do
t.datetime "activated_at"
t.index ["email"], name: "index_users_on_email", unique: true
end
end
......@@ -2,7 +2,7 @@ User.create!(name: "Example User",
email: "example@railstutorial.org",
password: "foobar",
password_confirmation: "foobar",
admin: true,
admin: true,
activated: true,
activated_at: Time.zone.now)
......
require 'test_helper'
require "test_helper"
class AccountActivationsControllerTest < ActionDispatch::IntegrationTest
# test "the truth" do
# assert true
# end
end
......@@ -8,7 +8,7 @@ class UsersSignupTest < ActionDispatch::IntegrationTest
test "invalid signup information" do
get signup_path
assert_no_difference "User.count" do
post users_path, params: {user: {name: "", email: "user@invalid", password: "foo", password_confirmation: "bar"}}
post users_path, params: {user: {name: "", email: "user@invalid", password: "foo", password_confirmation: "bar"}}
end
assert_template "users/new"
assert_select "div#error_explanation"
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment