sqlite3, test coverage improvements, auto auth

This commit is contained in:
2015-10-23 19:34:59 -05:00
parent 41ceccc5b5
commit 7ddf93578e
15 changed files with 143 additions and 83 deletions

View File

@ -1,22 +1,19 @@
---
default: &default
adapter: mysql2
adapter: sqlite3
database: db/default.sqlite3
encoding: utf8
reconnect: false
pool: 5
host: localhost
# socket: /tmp/mysql.sock
timeout: 5000
development:
<<: *default
database: sms-pager-dev
database: db/development.sqlite3
test:
<<: *default
database: sms-pager-test
database: db/test.sqlite3
production:
<<: *default
database: sms-pager-api
username: <%= ENV["mysql_usr"] %>
password: <%= ENV["mysql_pwd"] %>
database: db/production.sqlite3

View File

@ -131,7 +131,7 @@ Rails.application.config.sorcery.configure do |config|
config.google.key = ENV["google_key"]
config.google.secret = ENV["google_secret"]
config.google.callback_url = "http://localhost:3000/oauth/callback?provider=google"
config.google.user_info_mapping = { email: "email" }
config.google.user_info_mapping = { email: "email", first_name: "given_name", last_name: "family_name" }
# config.vk.key = ""
# config.vk.secret = ""