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

Fixed coding styles

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