Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

More gem updates #863

Merged
merged 9 commits into from
Sep 25, 2017
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
2 changes: 1 addition & 1 deletion Gemfile
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ ruby '2.3.3'
gem 'actionmailer', '~> 4.2.9'
gem 'compass-rails'
gem 'dalli', '~> 2.7.1'
gem 'faraday-http-cache', '~> 1.0'
gem 'faraday-http-cache', '~> 2.0'
gem 'figaro'
gem 'font-awesome-rails'
gem 'google-api-client', '~> 0.9'
Expand Down
44 changes: 24 additions & 20 deletions Gemfile.lock
Original file line number Diff line number Diff line change
Expand Up @@ -28,26 +28,27 @@ GEM
minitest (~> 5.1)
thread_safe (~> 0.3, >= 0.3.4)
tzinfo (~> 1.1)
addressable (2.3.8)
addressable (2.5.2)
public_suffix (>= 2.0.2, < 4.0)
ast (2.3.0)
axiom-types (0.1.1)
descendants_tracker (~> 0.0.4)
ice_nine (~> 0.11.0)
thread_safe (~> 0.3, >= 0.3.1)
benchmark-ips (2.5.0)
better_errors (2.1.1)
better_errors (2.3.0)
coderay (>= 1.0.0)
erubis (>= 2.6.6)
erubi (>= 1.0.0)
rack (>= 0.9.0)
binding_of_caller (0.7.2)
debug_inspector (>= 0.0.1)
builder (3.2.3)
bummr (0.2.0)
bummr (0.2.1)
rainbow
thor
capybara (2.14.4)
capybara (2.15.1)
addressable
mime-types (>= 1.16)
mini_mime (>= 0.1.3)
nokogiri (>= 1.3.3)
rack (>= 1.0.0)
rack-test (>= 0.5.4)
Expand All @@ -56,7 +57,7 @@ GEM
cliver (0.3.2)
codeclimate-engine-rb (0.4.0)
virtus (~> 1.0)
coderay (1.1.1)
coderay (1.1.2)
coercible (1.0.0)
descendants_tracker (~> 0.0.1)
compass (1.0.3)
Expand Down Expand Up @@ -107,11 +108,12 @@ GEM
launchy (~> 2.1)
mail (~> 2.6)
equalizer (0.0.11)
erubi (1.6.1)
erubis (2.7.0)
execjs (2.7.0)
faraday (0.9.2)
faraday (0.13.1)
multipart-post (>= 1.2, < 3)
faraday-http-cache (1.3.1)
faraday-http-cache (2.0.0)
faraday (~> 0.8)
ffi (1.9.14)
figaro (1.1.1)
Expand Down Expand Up @@ -196,27 +198,29 @@ GEM
mime-types (3.1)
mime-types-data (~> 3.2015)
mime-types-data (3.2016.0521)
mini_mime (0.1.4)
mini_portile2 (2.3.0)
minitest (5.10.3)
multi_json (1.12.1)
multipart-post (2.0.0)
nokogiri (1.8.1)
mini_portile2 (~> 2.3.0)
ohanakapa (1.1.2)
sawyer (~> 0.5.3)
ohanakapa (1.1.3)
sawyer (~> 0.8)
os (0.9.6)
parser (2.4.0.0)
ast (~> 2.2)
poltergeist (1.15.0)
poltergeist (1.16.0)
capybara (~> 2.1)
cliver (~> 0.3.1)
websocket-driver (>= 0.2.0)
powerpack (0.1.1)
public_suffix (3.0.0)
puma (3.9.1)
quiet_assets (1.1.0)
railties (>= 3.1, < 5.0)
rack (1.6.8)
rack-cache (1.7.0)
rack-cache (1.7.1)
rack (>= 0.4)
rack-mini-profiler (0.10.5)
rack (>= 1.2.0)
Expand Down Expand Up @@ -247,7 +251,7 @@ GEM
rb-fsevent (0.9.8)
rb-inotify (0.9.7)
ffi (>= 0.5.0)
reek (4.7.1)
reek (4.7.2)
codeclimate-engine-rb (~> 0.4.0)
parser (>= 2.4.0.0, < 2.5)
rainbow (~> 2.0)
Expand All @@ -266,7 +270,7 @@ GEM
rspec-mocks (3.6.0)
diff-lcs (>= 1.2.0, < 2.0)
rspec-support (~> 3.6.0)
rspec-rails (3.6.0)
rspec-rails (3.6.1)
actionpack (>= 3.0)
activesupport (>= 3.0)
railties (>= 3.0)
Expand All @@ -293,9 +297,9 @@ GEM
sprockets (>= 2.8, < 4.0)
sprockets-rails (>= 2.0, < 4.0)
tilt (>= 1.1, < 3)
sawyer (0.5.5)
addressable (~> 2.3.5)
faraday (~> 0.8, < 0.10)
sawyer (0.8.1)
addressable (>= 2.3.5, < 2.6)
faraday (~> 0.8, < 1.0)
sexp_processor (4.9.0)
signet (0.7.3)
addressable (~> 2.3)
Expand Down Expand Up @@ -347,7 +351,7 @@ GEM
addressable (>= 2.3.6)
crack (>= 0.3.2)
hashdiff
websocket-driver (0.6.5)
websocket-driver (0.7.0)
websocket-extensions (>= 0.1.0)
websocket-extensions (0.1.2)
xpath (2.1.0)
Expand All @@ -368,7 +372,7 @@ DEPENDENCIES
dalli (~> 2.7.1)
derailed
email_spec
faraday-http-cache (~> 1.0)
faraday-http-cache (~> 2.0)
figaro
flamegraph
font-awesome-rails
Expand Down
8 changes: 0 additions & 8 deletions spec/controllers/status_controller_spec.rb
Original file line number Diff line number Diff line change
Expand Up @@ -23,19 +23,11 @@
stub_request(:get,
'http://ohana-api-test.herokuapp.com/api/locations/' \
'san-mateo-free-medical-clinic').
with(headers: { 'Accept' => 'application/vnd.ohanapi-v1+json',
'Accept-Encoding' =>
'gzip;q=1.0,deflate;q=0.6,identity;q=0.3',
'User-Agent' => 'Ohanakapa Ruby Gem 1.1.2' }).
to_return(status: 200, body: '', headers: {})

stub_request(:get,
'http://ohana-api-test.herokuapp.com/api/' \
'search?keyword=food').
with(headers: { 'Accept' => 'application/vnd.ohanapi-v1+json',
'Accept-Encoding' =>
'gzip;q=1.0,deflate;q=0.6,identity;q=0.3',
'User-Agent' => 'Ohanakapa Ruby Gem 1.1.2' }).
to_return(status: 200, body: '', headers: {})

get 'check_status'
Expand Down