mirror of
https://github.com/fspc/bike-database.git
synced 2025-02-23 01:23:24 -05:00
lk | update rails version, fix logging in specs, and remove turbolinks
This commit is contained in:
Louis Knapp
parent
2c98232f46
commit
ac9921a879
4
Gemfile
4
Gemfile
@ -1,6 +1,6 @@
|
||||
source 'https://rubygems.org'
|
||||
|
||||
gem 'rails', '4.0.1'
|
||||
gem 'rails', '4.2'
|
||||
gem 'pg', '0.15.1'
|
||||
gem 'bcrypt-ruby', '3.1.2'
|
||||
gem 'devise'
|
||||
@ -41,8 +41,6 @@ end
|
||||
|
||||
gem 'uglifier', '2.1.1'
|
||||
gem 'jquery-rails', '3.0.4'
|
||||
gem 'jquery-turbolinks'
|
||||
gem 'turbolinks', '1.1.1'
|
||||
gem 'jbuilder', '1.0.2'
|
||||
|
||||
group :doc do
|
||||
|
||||
227
Gemfile.lock
227
Gemfile.lock
@ -1,32 +1,43 @@
|
||||
GEM
|
||||
remote: https://rubygems.org/
|
||||
specs:
|
||||
actionmailer (4.0.1)
|
||||
actionpack (= 4.0.1)
|
||||
mail (~> 2.5.4)
|
||||
actionpack (4.0.1)
|
||||
activesupport (= 4.0.1)
|
||||
builder (~> 3.1.0)
|
||||
erubis (~> 2.7.0)
|
||||
rack (~> 1.5.2)
|
||||
actionmailer (4.2.0)
|
||||
actionpack (= 4.2.0)
|
||||
actionview (= 4.2.0)
|
||||
activejob (= 4.2.0)
|
||||
mail (~> 2.5, >= 2.5.4)
|
||||
rails-dom-testing (~> 1.0, >= 1.0.5)
|
||||
actionpack (4.2.0)
|
||||
actionview (= 4.2.0)
|
||||
activesupport (= 4.2.0)
|
||||
rack (~> 1.6.0)
|
||||
rack-test (~> 0.6.2)
|
||||
activemodel (4.0.1)
|
||||
activesupport (= 4.0.1)
|
||||
builder (~> 3.1.0)
|
||||
activerecord (4.0.1)
|
||||
activemodel (= 4.0.1)
|
||||
activerecord-deprecated_finders (~> 1.0.2)
|
||||
activesupport (= 4.0.1)
|
||||
arel (~> 4.0.0)
|
||||
activerecord-deprecated_finders (1.0.4)
|
||||
activesupport (4.0.1)
|
||||
i18n (~> 0.6, >= 0.6.4)
|
||||
minitest (~> 4.2)
|
||||
multi_json (~> 1.3)
|
||||
thread_safe (~> 0.1)
|
||||
tzinfo (~> 0.3.37)
|
||||
rails-dom-testing (~> 1.0, >= 1.0.5)
|
||||
rails-html-sanitizer (~> 1.0, >= 1.0.1)
|
||||
actionview (4.2.0)
|
||||
activesupport (= 4.2.0)
|
||||
builder (~> 3.1)
|
||||
erubis (~> 2.7.0)
|
||||
rails-dom-testing (~> 1.0, >= 1.0.5)
|
||||
rails-html-sanitizer (~> 1.0, >= 1.0.1)
|
||||
activejob (4.2.0)
|
||||
activesupport (= 4.2.0)
|
||||
globalid (>= 0.3.0)
|
||||
activemodel (4.2.0)
|
||||
activesupport (= 4.2.0)
|
||||
builder (~> 3.1)
|
||||
activerecord (4.2.0)
|
||||
activemodel (= 4.2.0)
|
||||
activesupport (= 4.2.0)
|
||||
arel (~> 6.0)
|
||||
activesupport (4.2.0)
|
||||
i18n (~> 0.7)
|
||||
json (~> 1.7, >= 1.7.7)
|
||||
minitest (~> 5.1)
|
||||
thread_safe (~> 0.3, >= 0.3.4)
|
||||
tzinfo (~> 1.1)
|
||||
addressable (2.3.8)
|
||||
arel (4.0.2)
|
||||
arel (6.0.3)
|
||||
assert_difference (1.0.0)
|
||||
activesupport (>= 3.0.0)
|
||||
bcrypt (3.1.10)
|
||||
@ -39,30 +50,62 @@ GEM
|
||||
debug_inspector (>= 0.0.1)
|
||||
bootstrap-sass (2.3.2.0)
|
||||
sass (~> 3.2)
|
||||
builder (3.1.4)
|
||||
builder (3.2.2)
|
||||
capybara (2.2.0)
|
||||
mime-types (>= 1.16)
|
||||
nokogiri (>= 1.3.3)
|
||||
rack (>= 1.0.0)
|
||||
rack-test (>= 0.5.4)
|
||||
xpath (~> 2.0)
|
||||
celluloid (0.16.0)
|
||||
timers (~> 4.0.0)
|
||||
celluloid (0.17.1.2)
|
||||
bundler
|
||||
celluloid-essentials
|
||||
celluloid-extras
|
||||
celluloid-fsm
|
||||
celluloid-pool
|
||||
celluloid-supervision
|
||||
dotenv
|
||||
nenv
|
||||
rspec-logsplit (>= 0.1.2)
|
||||
timers (>= 4.1.1)
|
||||
celluloid-essentials (0.20.2.1)
|
||||
bundler
|
||||
dotenv
|
||||
nenv
|
||||
rspec-logsplit (>= 0.1.2)
|
||||
timers (>= 4.1.1)
|
||||
celluloid-extras (0.20.1)
|
||||
bundler
|
||||
dotenv
|
||||
nenv
|
||||
rspec-logsplit (>= 0.1.2)
|
||||
timers (>= 4.1.1)
|
||||
celluloid-fsm (0.20.1)
|
||||
bundler
|
||||
dotenv
|
||||
nenv
|
||||
rspec-logsplit (>= 0.1.2)
|
||||
timers (>= 4.1.1)
|
||||
celluloid-pool (0.20.1)
|
||||
bundler
|
||||
dotenv
|
||||
nenv
|
||||
rspec-logsplit (>= 0.1.2)
|
||||
timers (>= 4.1.1)
|
||||
celluloid-supervision (0.20.1.1)
|
||||
bundler
|
||||
dotenv
|
||||
nenv
|
||||
rspec-logsplit (>= 0.1.2)
|
||||
timers (>= 4.1.1)
|
||||
childprocess (0.5.6)
|
||||
ffi (~> 1.0, >= 1.0.11)
|
||||
coderay (1.1.0)
|
||||
coffee-rails (4.1.0)
|
||||
coffee-script (>= 2.2.0)
|
||||
railties (>= 4.0.0, < 5.0)
|
||||
coffee-script (2.4.1)
|
||||
coffee-script-source
|
||||
execjs
|
||||
coffee-script-source (1.9.1.1)
|
||||
connection_pool (2.1.3)
|
||||
connection_pool (2.2.0)
|
||||
crack (0.4.2)
|
||||
safe_yaml (~> 1.0.0)
|
||||
debug_inspector (0.0.2)
|
||||
devise (3.4.1)
|
||||
devise (3.5.2)
|
||||
bcrypt (~> 3.0)
|
||||
orm_adapter (~> 0.1)
|
||||
railties (>= 3.2.6, < 5)
|
||||
@ -75,43 +118,44 @@ GEM
|
||||
dotenv (= 2.0.2)
|
||||
railties (~> 4.0)
|
||||
erubis (2.7.0)
|
||||
execjs (2.5.2)
|
||||
execjs (2.6.0)
|
||||
factory_girl (4.5.0)
|
||||
activesupport (>= 3.0.0)
|
||||
factory_girl_rails (4.5.0)
|
||||
factory_girl (~> 4.5.0)
|
||||
railties (>= 3.0.0)
|
||||
faker (1.4.3)
|
||||
faker (1.5.0)
|
||||
i18n (~> 0.5)
|
||||
faraday (0.9.1)
|
||||
multipart-post (>= 1.2, < 3)
|
||||
ffi (1.9.8)
|
||||
ffi (1.9.10)
|
||||
globalid (0.3.6)
|
||||
activesupport (>= 4.1.0)
|
||||
growl (1.0.3)
|
||||
haml (4.0.6)
|
||||
haml (4.0.7)
|
||||
tilt
|
||||
hike (1.2.3)
|
||||
hitimes (1.2.2)
|
||||
hitimes (1.2.3)
|
||||
i18n (0.7.0)
|
||||
jbuilder (1.0.2)
|
||||
activesupport (>= 3.0.0)
|
||||
jquery-rails (3.0.4)
|
||||
railties (>= 3.0, < 5.0)
|
||||
thor (>= 0.14, < 2.0)
|
||||
jquery-turbolinks (2.1.0)
|
||||
railties (>= 3.1.0)
|
||||
turbolinks
|
||||
json (1.8.2)
|
||||
json (1.8.3)
|
||||
jwt (1.5.1)
|
||||
mail (2.5.4)
|
||||
mime-types (~> 1.16)
|
||||
treetop (~> 1.4.8)
|
||||
loofah (2.0.3)
|
||||
nokogiri (>= 1.5.9)
|
||||
mail (2.6.3)
|
||||
mime-types (>= 1.16, < 3)
|
||||
method_source (0.8.2)
|
||||
mime-types (1.25.1)
|
||||
mime-types (2.6.2)
|
||||
mini_portile (0.6.2)
|
||||
minitest (4.7.5)
|
||||
multi_json (1.11.0)
|
||||
minitest (5.8.0)
|
||||
multi_json (1.11.2)
|
||||
multi_xml (0.5.5)
|
||||
multipart-post (2.0.0)
|
||||
nenv (0.2.0)
|
||||
nokogiri (1.6.6.2)
|
||||
mini_portile (~> 0.6.0)
|
||||
oauth2 (1.0.0)
|
||||
@ -122,44 +166,54 @@ GEM
|
||||
rack (~> 1.2)
|
||||
orm_adapter (0.5.0)
|
||||
pg (0.15.1)
|
||||
polyglot (0.3.5)
|
||||
pry (0.10.1)
|
||||
coderay (~> 1.1.0)
|
||||
method_source (~> 0.8.1)
|
||||
slop (~> 3.4)
|
||||
pry-rails (0.3.4)
|
||||
pry (>= 0.9.10)
|
||||
rack (1.5.2)
|
||||
rack (1.6.4)
|
||||
rack-protection (1.5.3)
|
||||
rack
|
||||
rack-test (0.6.3)
|
||||
rack (>= 1.0)
|
||||
rails (4.0.1)
|
||||
actionmailer (= 4.0.1)
|
||||
actionpack (= 4.0.1)
|
||||
activerecord (= 4.0.1)
|
||||
activesupport (= 4.0.1)
|
||||
rails (4.2.0)
|
||||
actionmailer (= 4.2.0)
|
||||
actionpack (= 4.2.0)
|
||||
actionview (= 4.2.0)
|
||||
activejob (= 4.2.0)
|
||||
activemodel (= 4.2.0)
|
||||
activerecord (= 4.2.0)
|
||||
activesupport (= 4.2.0)
|
||||
bundler (>= 1.3.0, < 2.0)
|
||||
railties (= 4.0.1)
|
||||
sprockets-rails (~> 2.0.0)
|
||||
railties (= 4.2.0)
|
||||
sprockets-rails
|
||||
rails-deprecated_sanitizer (1.0.3)
|
||||
activesupport (>= 4.2.0.alpha)
|
||||
rails-dom-testing (1.0.7)
|
||||
activesupport (>= 4.2.0.beta, < 5.0)
|
||||
nokogiri (~> 1.6.0)
|
||||
rails-deprecated_sanitizer (>= 1.0.1)
|
||||
rails-html-sanitizer (1.0.2)
|
||||
loofah (~> 2.0)
|
||||
rails_12factor (0.0.2)
|
||||
rails_serve_static_assets
|
||||
rails_stdout_logging
|
||||
rails_serve_static_assets (0.0.4)
|
||||
rails_stdout_logging (0.0.3)
|
||||
railties (4.0.1)
|
||||
actionpack (= 4.0.1)
|
||||
activesupport (= 4.0.1)
|
||||
rails_stdout_logging (0.0.4)
|
||||
railties (4.2.0)
|
||||
actionpack (= 4.2.0)
|
||||
activesupport (= 4.2.0)
|
||||
rake (>= 0.8.7)
|
||||
thor (>= 0.18.1, < 2.0)
|
||||
rake (10.4.2)
|
||||
rdoc (3.12.2)
|
||||
json (~> 1.4)
|
||||
redis (3.2.1)
|
||||
redis-namespace (1.5.1)
|
||||
redis-namespace (1.5.2)
|
||||
redis (~> 3.0, >= 3.0.4)
|
||||
responders (1.1.2)
|
||||
railties (>= 3.2, < 4.2)
|
||||
responders (2.1.0)
|
||||
railties (>= 4.2.0, < 5)
|
||||
rspec (3.2.0)
|
||||
rspec-core (~> 3.2.0)
|
||||
rspec-expectations (~> 3.2.0)
|
||||
@ -169,10 +223,11 @@ GEM
|
||||
rspec-expectations (3.2.1)
|
||||
diff-lcs (>= 1.2.0, < 2.0)
|
||||
rspec-support (~> 3.2.0)
|
||||
rspec-logsplit (0.1.3)
|
||||
rspec-mocks (3.2.1)
|
||||
diff-lcs (>= 1.2.0, < 2.0)
|
||||
rspec-support (~> 3.2.0)
|
||||
rspec-rails (3.2.1)
|
||||
rspec-rails (3.2.3)
|
||||
actionpack (>= 3.0, < 4.3)
|
||||
activesupport (>= 3.0, < 4.3)
|
||||
railties (>= 3.0, < 4.3)
|
||||
@ -197,37 +252,33 @@ GEM
|
||||
multi_json (~> 1.0)
|
||||
rubyzip (< 1.0.0)
|
||||
websocket (~> 1.0.4)
|
||||
sidekiq (3.3.3)
|
||||
celluloid (>= 0.16.0)
|
||||
connection_pool (>= 2.1.1)
|
||||
json
|
||||
redis (>= 3.0.6)
|
||||
redis-namespace (>= 1.3.1)
|
||||
sinatra (1.4.5)
|
||||
sidekiq (3.5.0)
|
||||
celluloid (~> 0.17.0)
|
||||
connection_pool (~> 2.2, >= 2.2.0)
|
||||
json (~> 1.0)
|
||||
redis (~> 3.2, >= 3.2.1)
|
||||
redis-namespace (~> 1.5, >= 1.5.2)
|
||||
sinatra (1.4.6)
|
||||
rack (~> 1.4)
|
||||
rack-protection (~> 1.4)
|
||||
tilt (~> 1.3, >= 1.3.4)
|
||||
tilt (>= 1.3, < 3)
|
||||
slop (3.6.0)
|
||||
sprockets (2.12.3)
|
||||
sprockets (2.12.4)
|
||||
hike (~> 1.2)
|
||||
multi_json (~> 1.0)
|
||||
rack (~> 1.0)
|
||||
tilt (~> 1.1, != 1.3.0)
|
||||
sprockets-rails (2.0.1)
|
||||
sprockets-rails (2.3.3)
|
||||
actionpack (>= 3.0)
|
||||
activesupport (>= 3.0)
|
||||
sprockets (~> 2.8)
|
||||
sprockets (>= 2.8, < 4.0)
|
||||
thor (0.19.1)
|
||||
thread_safe (0.3.5)
|
||||
tilt (1.4.1)
|
||||
timers (4.0.1)
|
||||
timers (4.1.1)
|
||||
hitimes
|
||||
treetop (1.4.15)
|
||||
polyglot
|
||||
polyglot (>= 0.3.1)
|
||||
turbolinks (1.1.1)
|
||||
coffee-rails
|
||||
tzinfo (0.3.43)
|
||||
tzinfo (1.2.2)
|
||||
thread_safe (~> 0.1)
|
||||
uglifier (2.1.1)
|
||||
execjs (>= 0.3.0)
|
||||
multi_json (~> 1.0, >= 1.0.2)
|
||||
@ -261,12 +312,11 @@ DEPENDENCIES
|
||||
haml
|
||||
jbuilder (= 1.0.2)
|
||||
jquery-rails (= 3.0.4)
|
||||
jquery-turbolinks
|
||||
oauth2 (= 1.0.0)
|
||||
pg (= 0.15.1)
|
||||
pry
|
||||
pry-rails
|
||||
rails (= 4.0.1)
|
||||
rails (= 4.2)
|
||||
rails_12factor (= 0.0.2)
|
||||
rspec (~> 3.2.0)
|
||||
rspec-mocks (~> 3.2.0)
|
||||
@ -276,7 +326,6 @@ DEPENDENCIES
|
||||
selenium-webdriver (= 2.35.1)
|
||||
sidekiq
|
||||
sinatra
|
||||
turbolinks (= 1.1.1)
|
||||
uglifier (= 2.1.1)
|
||||
webmock (= 1.21.0)
|
||||
will_paginate (~> 3.0.6)
|
||||
|
||||
@ -12,7 +12,6 @@
|
||||
//
|
||||
//= require jquery
|
||||
//= require jquery_ujs
|
||||
//= require turbolinks
|
||||
//= require_tree .
|
||||
//= require bootstrap
|
||||
//= require bootstrap-datepicker
|
||||
|
||||
@ -5,7 +5,6 @@ class BikeIndexLogger
|
||||
|
||||
conn = Faraday.new(:url => "#{ENV['BIKE_INDEX_URL']}") do |faraday|
|
||||
faraday.request :url_encoded
|
||||
faraday.response :logger
|
||||
faraday.adapter Faraday.default_adapter
|
||||
end
|
||||
|
||||
|
||||
@ -13,7 +13,7 @@ Bikedb::Application.configure do
|
||||
config.eager_load = false
|
||||
|
||||
# Configure static asset server for tests with Cache-Control for performance.
|
||||
config.serve_static_assets = true
|
||||
config.serve_static_files = true
|
||||
config.static_cache_control = "public, max-age=3600"
|
||||
|
||||
# Show full error reports and disable caching.
|
||||
|
||||
@ -11,7 +11,9 @@ describe BikesController do
|
||||
|
||||
describe "POST #create" do
|
||||
it "creates a new bike with valid credentials" do
|
||||
expect{post :create, bike: FactoryGirl.attributes_for(:bike)}.to change(Bike, :count).by(1)
|
||||
expect{
|
||||
post :create, bike: FactoryGirl.attributes_for(:bike)
|
||||
}.to change(Bike, :count).by(1)
|
||||
end
|
||||
end
|
||||
|
||||
|
||||
Loading…
x
Reference in New Issue
Block a user