Skip to content

Commit 8ac8375

Browse files
committed
Merge pull request #5 from challengepost/base_app_improvements
Base app improvements
2 parents 67f03ef + 6e253db commit 8ac8375

File tree

5 files changed

+35
-29
lines changed

5 files changed

+35
-29
lines changed

Gemfile

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -59,6 +59,7 @@ group :development, :test do
5959
gem 'shoulda-matchers'
6060
gem 'steak'
6161
gem 'timecop'
62+
gem 'capybara-rails'
6263

6364
gem 'pry'
6465
gem 'pry-byebug'

Gemfile.lock

Lines changed: 13 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -62,6 +62,14 @@ GEM
6262
rack (>= 1.0.0)
6363
rack-test (>= 0.5.4)
6464
xpath (~> 2.0)
65+
capybara-console (0.0.4)
66+
capybara
67+
rails (>= 3.0)
68+
capybara-rails (0.0.2)
69+
capybara
70+
capybara-console
71+
database_cleaner
72+
exception_notification
6573
carrierwave (0.10.0)
6674
activemodel (>= 3.2.0)
6775
activesupport (>= 3.2.0)
@@ -90,6 +98,7 @@ GEM
9098
compass (>= 0.12.2)
9199
connection_pool (2.2.0)
92100
daemons (1.2.3)
101+
database_cleaner (1.4.1)
93102
devise (3.5.1)
94103
bcrypt (~> 3.0)
95104
orm_adapter (~> 0.1)
@@ -106,6 +115,9 @@ GEM
106115
erubis (2.7.0)
107116
escape (0.0.4)
108117
eventmachine (1.0.7)
118+
exception_notification (4.1.1)
119+
actionmailer (>= 3.0.4)
120+
activesupport (>= 3.0.4)
109121
excon (0.45.4)
110122
execjs (2.5.2)
111123
factory_girl (4.5.0)
@@ -417,6 +429,7 @@ PLATFORMS
417429

418430
DEPENDENCIES
419431
cancan
432+
capybara-rails
420433
carrierwave
421434
carrierwave_backgrounder
422435
coffee-rails (~> 4.0.0)

config/database-example.yml

Lines changed: 18 additions & 23 deletions
Original file line numberDiff line numberDiff line change
@@ -1,31 +1,26 @@
1-
development:
2-
adapter: postgresql
3-
encoding: unicode
4-
database: rails_template_development
5-
pool: 5
6-
username:
7-
password:
81

9-
staging:
10-
adapter: postgresql
11-
encoding: unicode
12-
database: rails_template_development
2+
# SQLite version 3.x
3+
# gem install sqlite3
4+
#
5+
# Ensure the SQLite 3 gem is defined in your Gemfile
6+
# gem 'sqlite3'
7+
development:
8+
adapter: sqlite3
9+
database: db/development.sqlite3
1310
pool: 5
14-
username:
15-
password:
11+
timeout: 5000
1612

13+
# Warning: The database defined as "test" will be erased and
14+
# re-generated from your development database when you run "rake".
15+
# Do not set this db to the same as development or production.
1716
test:
18-
adapter: postgresql
19-
encoding: unicode
20-
database: rails_template_test
17+
adapter: sqlite3
18+
database: db/test.sqlite3
2119
pool: 5
22-
username:
23-
password:
20+
timeout: 5000
2421

2522
production:
26-
adapter: postgresql
27-
encoding: unicode
28-
database: rails_template_production
23+
adapter: sqlite3
24+
database: db/production.sqlite3
2925
pool: 5
30-
username:
31-
password:
26+
timeout: 5000

config/environments/test.rb

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@
2121
config.action_controller.perform_caching = false
2222

2323
# Raise exceptions instead of rendering exception templates.
24-
config.action_dispatch.show_exceptions = false
24+
config.action_dispatch.show_exceptions = true
2525

2626
# Disable request forgery protection in test environment.
2727
config.action_controller.allow_forgery_protection = false

db/schema.rb

Lines changed: 2 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -13,9 +13,6 @@
1313

1414
ActiveRecord::Schema.define(version: 20150714225535) do
1515

16-
# These are extensions that must be enabled in order to support this database
17-
enable_extension "plpgsql"
18-
1916
create_table "todos", force: :cascade do |t|
2017
t.string "title"
2118
end
@@ -35,7 +32,7 @@
3532
t.datetime "updated_at"
3633
end
3734

38-
add_index "users", ["email"], name: "index_users_on_email", unique: true, using: :btree
39-
add_index "users", ["reset_password_token"], name: "index_users_on_reset_password_token", unique: true, using: :btree
35+
add_index "users", ["email"], name: "index_users_on_email", unique: true
36+
add_index "users", ["reset_password_token"], name: "index_users_on_reset_password_token", unique: true
4037

4138
end

0 commit comments

Comments
 (0)