+ <%= f.label :email, "Email Address" %>
+ <%= f.text_field :email %>
+
+
+ <%= f.label :password %>
+ <%= f.password_field :password %>
+
+
<%= t('login_description') %>
-
<%= link_to t('login'), user_login_url %>
+
<%= link_to t('login'), login_url %>
<% end %>
\ No newline at end of file
diff --git a/app/views/users/new.html.erb b/app/views/users/new.html.erb
new file mode 100644
index 00000000..e69de29b
diff --git a/config/routes.rb b/config/routes.rb
index 97764e55..cf61d8e2 100644
--- a/config/routes.rb
+++ b/config/routes.rb
@@ -9,10 +9,20 @@ Rails.application.routes.draw do
end
end
- get '/login', to: 'sessions#new', as: :user_login
- get '/logout', to: 'sessions#destroy', as: :user_logout
+ get '/signup', to: 'users#new'
+ post '/signup', to: 'users#create'
- match '/auth/:provider/callback', to: 'sessions#create', via: [:get, :post]
+ # Login to Greenlight.
+ get '/login', to: 'sessions#new'
+
+ # Handles login of :greenlight provider account.
+ post '/login', to: 'sessions#create', as: :create_session
+
+ # Log the user out of the session.
+ get '/logout', to: 'sessions#destroy'
+
+ # Handles Omniauth authentication.
+ match '/auth/:provider/callback', to: 'sessions#omniauth_session', via: [:get, :post], as: :omniauth_session
get '/auth/failure', to: 'sessions#fail'
root to: 'main#index'
diff --git a/db/migrate/20180504131648_create_users.rb b/db/migrate/20180504131648_create_users.rb
index 0aeefa5e..e03d7742 100644
--- a/db/migrate/20180504131648_create_users.rb
+++ b/db/migrate/20180504131648_create_users.rb
@@ -1,11 +1,12 @@
class CreateUsers < ActiveRecord::Migration[5.0]
def change
create_table :users do |t|
- t.string :provider, null: false
- t.string :uid, null: false
+ t.string :provider
+ t.string :uid
t.string :name
t.string :username
t.string :email
+ t.string :password_digest, index: { unique: true }
t.timestamps
end
diff --git a/db/migrate/20180504131713_create_meetings.rb b/db/migrate/20180504131713_create_meetings.rb
index 416f3b0e..6acccce5 100644
--- a/db/migrate/20180504131713_create_meetings.rb
+++ b/db/migrate/20180504131713_create_meetings.rb
@@ -2,7 +2,7 @@ class CreateMeetings < ActiveRecord::Migration[5.0]
def change
create_table :meetings do |t|
t.belongs_to :room, index: true
- t.string :name, null: false
+ t.string :name, index: true
t.string :uid, index: true
t.timestamps
diff --git a/db/schema.rb b/db/schema.rb
index 0a80dd18..2fb5b1f1 100644
--- a/db/schema.rb
+++ b/db/schema.rb
@@ -14,10 +14,11 @@ ActiveRecord::Schema.define(version: 20180504131713) do
create_table "meetings", force: :cascade do |t|
t.integer "room_id"
- t.string "name", null: false
+ t.string "name"
t.string "uid"
t.datetime "created_at", null: false
t.datetime "updated_at", null: false
+ t.index ["name"], name: "index_meetings_on_name"
t.index ["room_id"], name: "index_meetings_on_room_id"
t.index ["uid"], name: "index_meetings_on_uid"
end
@@ -32,13 +33,15 @@ ActiveRecord::Schema.define(version: 20180504131713) do
end
create_table "users", force: :cascade do |t|
- t.string "provider", null: false
- t.string "uid", null: false
+ t.string "provider"
+ t.string "uid"
t.string "name"
t.string "username"
t.string "email"
- t.datetime "created_at", null: false
- t.datetime "updated_at", null: false
+ t.string "password_digest"
+ t.datetime "created_at", null: false
+ t.datetime "updated_at", null: false
+ t.index ["password_digest"], name: "index_users_on_password_digest", unique: true
end
end
diff --git a/db/seeds.rb b/db/seeds.rb
index 1beea2ac..a50361c9 100644
--- a/db/seeds.rb
+++ b/db/seeds.rb
@@ -5,3 +5,13 @@
#
# movies = Movie.create([{ name: 'Star Wars' }, { name: 'Lord of the Rings' }])
# Character.create(name: 'Luke', movie: movies.first)
+
+User.create(
+ provider: "greenlight",
+ name: "Test User",
+ uid: "someuid",
+ username: "testuser",
+ email: "test@user.com",
+ password: "test",
+ password_confirmation: "test",
+)
\ No newline at end of file
diff --git a/test/controllers/sessions_controller_test.rb b/test/controllers/sessions_controller_test.rb
index 6135ce6a..20386d58 100644
--- a/test/controllers/sessions_controller_test.rb
+++ b/test/controllers/sessions_controller_test.rb
@@ -1,7 +1,63 @@
require 'test_helper'
class SessionsControllerTest < ActionDispatch::IntegrationTest
- # test "the truth" do
- # assert true
- # end
+
+ def setup
+ @user = User.new(
+ name: "Example User",
+ username: "Username",
+ provider: "greenlight",
+ email: "user@example.com",
+ password: "example",
+ password_confirmation: "example"
+ )
+
+ @user.save!
+ end
+
+ test 'can signin with greenlight account.' do
+ post create_session_path, params: {session: {email: @user.email, password: @user.password}}
+
+ assert_redirected_to room_path(@user.room.uid)
+ assert @user.id, session[:user_id]
+ end
+
+ test 'can signup for greenlight account.' do
+
+ end
+
+ test 'can signup/login with omniauth.' do
+ email = "omniauth@test.com"
+ uid = "123456789"
+
+ OmniAuth.config.add_mock(:twitter, {
+ provider: "twitter",
+ uid: uid,
+ info: {
+ email: email,
+ name: "Omni User",
+ nickname: "username"
+ }
+ })
+
+ get "/auth/twitter"
+
+ request.env['omniauth.auth'] = OmniAuth.config.mock_auth[:twitter]
+ get omniauth_session_path(provider: "twitter")
+
+ user = User.find_by(email: email, uid: uid)
+
+ assert_not_nil user
+ assert_redirected_to room_path(user.room.uid)
+ assert @user.id, session[:user_id]
+ end
+
+ test 'can logout.' do
+ post create_session_path, params: {session: {email: @user.email, password: @user.password}}
+ assert @user.id, session[:user_id]
+
+ get logout_path
+ assert_not_equal @user.id, session[:user_id]
+ end
+
end
diff --git a/test/controllers/users_controller_test.rb b/test/controllers/users_controller_test.rb
index 6c3da770..3a4935ff 100644
--- a/test/controllers/users_controller_test.rb
+++ b/test/controllers/users_controller_test.rb
@@ -1,7 +1,5 @@
require 'test_helper'
class UsersControllerTest < ActionDispatch::IntegrationTest
- # test "the truth" do
- # assert true
- # end
+
end
diff --git a/test/models/meeting_test.rb b/test/models/meeting_test.rb
index 063e6b91..b67e0fc7 100644
--- a/test/models/meeting_test.rb
+++ b/test/models/meeting_test.rb
@@ -1,7 +1,32 @@
require 'test_helper'
class MeetingTest < ActiveSupport::TestCase
- # test "the truth" do
- # assert true
- # end
+
+ def setup
+ @user = User.new(
+ name: "Example User",
+ username: "Username",
+ provider: "greenlight",
+ email: "user@example.com",
+ password: "example",
+ password_confirmation: "example"
+ )
+
+ @room = Room.new(user: @user)
+
+ @meeting = Meeting.new(
+ name: "Test Meeting",
+ room: @room
+ )
+ end
+
+ test "name should be present." do
+ @meeting.name = nil
+ assert_not @meeting.valid?
+ end
+
+ test "should set uid on creation." do
+ @meeting.save
+ assert @meeting.uid
+ end
end
diff --git a/test/models/room_test.rb b/test/models/room_test.rb
index 2f0b89f4..f671024d 100644
--- a/test/models/room_test.rb
+++ b/test/models/room_test.rb
@@ -1,7 +1,39 @@
require 'test_helper'
class RoomTest < ActiveSupport::TestCase
- # test "the truth" do
- # assert true
- # end
+
+ def setup
+ @user = User.new(
+ name: "Example User",
+ username: "Username",
+ provider: "greenlight",
+ email: "user@example.com",
+ password: "example",
+ password_confirmation: "example"
+ )
+
+ @room = Room.new(
+ user: @user
+ )
+ end
+
+ test "#owned_by? should identify correct owner." do
+ assert @room.owned_by?(@user)
+ end
+
+ test "#owned_by? should identify incorrect owner." do
+ diff_user = User.new(
+ name: "Different User",
+ username: "Diffname",
+ provider: "greenlight",
+ email: "diff@example.com",
+ )
+
+ assert_not @room.owned_by?(diff_user)
+ end
+
+ test "should set uid on creation." do
+ @room.save
+ assert @room.uid
+ end
end
diff --git a/test/models/user_test.rb b/test/models/user_test.rb
index 82f61e01..5a612194 100644
--- a/test/models/user_test.rb
+++ b/test/models/user_test.rb
@@ -1,7 +1,120 @@
require 'test_helper'
class UserTest < ActiveSupport::TestCase
- # test "the truth" do
- # assert true
- # end
+
+ def setup
+ @user = User.new(
+ name: "Example User",
+ username: "Username",
+ provider: "greenlight",
+ email: "user@example.com",
+ password: "example",
+ password_confirmation: "example"
+ )
+ end
+
+ test "should be valid." do
+ assert @user.valid?
+ end
+
+ test "name should be present." do
+ @user.name = nil
+ assert_not @user.valid?
+ end
+
+ test "email should be present." do
+ @user.email = nil
+ assert_not @user.valid?
+ end
+
+ test "username should be present." do
+ @user.username = nil
+ assert_not @user.valid?
+ end
+
+ test "provider should be present." do
+ @user.provider = nil
+ assert_not @user.valid?
+ end
+
+ test "should allow nil uid." do
+ @user.uid = nil
+ assert @user.valid?
+ end
+
+ test "should allow nil password." do
+ @user.password = @user.password_confirmation = nil
+ assert @user.valid?
+ end
+
+ test "should create user from omniauth" do
+ auth = {
+ "uid" => "123456789",
+ "provider" => "twitter",
+ "info" => {
+ "name" => "Test Name",
+ "nickname" => "username",
+ "email" => "test@example.com"
+ }
+ }
+
+ assert_difference 'User.count' do
+ User.from_omniauth(auth)
+ end
+
+ user = User.find_by(uid: auth["uid"], provider: auth["provider"])
+
+ assert user.username, auth["info"]["nickname"]
+ assert user.name, auth["info"]["name"]
+ end
+
+ test "email addresses should be saved as lower-case." do
+ mixed_case = "ExAmPlE@eXaMpLe.CoM"
+ @user.email = mixed_case
+ @user.save
+ assert_equal mixed_case.downcase, @user.email
+ end
+
+ test "email validation should reject invalid addresses." do
+ invalid_addresses = %w[user@example,com user_at_foo.org user.name@example. foo@bar_baz.com foo@bar+baz.com]
+ invalid_addresses.each do |invalid_address|
+ @user.email = invalid_address
+ assert_not @user.valid?, "#{invalid_address.inspect} should be invalid."
+ end
+ end
+
+ test "email should be unique." do
+ duplicate_user = @user.dup
+ duplicate_user.email = @user.email.upcase
+ @user.save
+ assert_not duplicate_user.valid?
+ end
+
+ test "name should not be too long." do
+ @user.name = "a" * 25
+ assert_not @user.valid?
+ end
+
+ test "email should not be too long." do
+ @user.email = "a" * 50 + "@example.com"
+ assert_not @user.valid?
+ end
+
+ test "password should have a minimum length." do
+ @user.password = @user.password_confirmation = "a" * 5
+ assert_not @user.valid?
+ end
+
+ test "should authenticate on valid password." do
+ assert_not_equal @user.authenticate('example'), false
+ end
+
+ test "should not authenticate on invalid password." do
+ assert_not @user.authenticate('incorrect')
+ end
+
+ test "should create room when saved." do
+ @user.save
+ assert @user.room
+ end
end
diff --git a/test/test_helper.rb b/test/test_helper.rb
index 92e39b2d..344a2be8 100644
--- a/test/test_helper.rb
+++ b/test/test_helper.rb
@@ -6,5 +6,5 @@ class ActiveSupport::TestCase
# Setup all fixtures in test/fixtures/*.yml for all tests in alphabetical order.
fixtures :all
- # Add more helper methods to be used by all tests here...
-end
+ OmniAuth.config.test_mode = true
+end
\ No newline at end of file