Foodsoft/foodsoft
1
1
Fork 0
Code Issues 36 Pull requests 5 Projects 1 Releases Wiki Activity

Fix specs after update (switching to webkit)

Browse source
This commit is contained in:
wvengen 2017-04-01 15:12:05 +02:00 • committed by wvengen
parent ddf7402a3b
commit b857b10814
6 changed files with 21 additions and 42 deletions
Download patch file Download diff file Expand all files Collapse all files

27
Gemfile.lock
View file

@ -71,7 +71,8 @@ GEM
tzinfo (~> 1.1)
acts_as_tree (2.6.1)
activerecord (>= 3.0.0)
addressable (2.4.0)
addressable (2.5.1)
public_suffix (~> 2.0, >= 2.0.2)
arel (6.0.4)
attribute_normalizer (1.2.0)
base32 (0.3.2)
@ -101,15 +102,16 @@ GEM
capistrano-rvm (0.1.2)
capistrano (~> 3.0)
sshkit (~> 1.2)
capybara (2.7.1)
capybara (2.13.0)
addressable
mime-types (>= 1.16)
nokogiri (>= 1.3.3)
rack (>= 1.0.0)
rack-test (>= 0.5.4)
xpath (~> 2.0)
childprocess (0.5.9)
ffi (~> 1.0, >= 1.0.11)
capybara-webkit (1.14.0)
capybara (>= 2.3.0, < 2.14.0)
json
chronic (0.10.2)
coderay (1.1.1)
coffee-rails (4.1.1)
@ -159,7 +161,6 @@ GEM
railties (>= 3.0.0)
faker (1.7.3)
i18n (~> 0.5)
ffi (1.9.10)
gaffe (1.2.0)
rails (>= 4.0.0)
git-version-bump (0.15.1)
@ -199,7 +200,7 @@ GEM
interception (0.5)
iso (0.2.1)
i18n
jquery-rails (4.2.2)
jquery-rails (4.3.1)
rails-dom-testing (>= 1, < 3)
railties (>= 4.2.0)
thor (>= 0.14, < 2.0)
@ -269,6 +270,7 @@ GEM
pry-stack_explorer (0.4.9.2)
binding_of_caller (>= 0.7)
pry (>= 0.9.11)
public_suffix (2.0.5)
quiet_assets (1.1.0)
railties (>= 3.1, < 5.0)
rack (1.6.5)
@ -372,7 +374,7 @@ GEM
rspec (~> 3.0)
rspec-support (3.4.1)
ruby-filemagic (0.7.1)
ruby-ole (1.2.12)
ruby-ole (1.2.12.1)
ruby-prof (0.15.9)
ruby-units (2.0.0)
ruby_parser (3.8.2)
@ -387,10 +389,6 @@ GEM
tilt (>= 1.1, < 3)
select2-rails (4.0.3)
thor (~> 0.14)
selenium-webdriver (2.53.1)
childprocess (~> 0.5)
rubyzip (~> 1.0)
websocket (~> 1.0)
sexp_processor (4.7.0)
simple-navigation (3.14.0)
activesupport (>= 2.3.2)
@ -437,7 +435,7 @@ GEM
rack (>= 1.0.0)
thor (0.19.4)
thread_safe (0.3.6)
tilt (2.0.6)
tilt (2.0.7)
tins (1.13.2)
ttfunk (1.4.0)
twitter-bootstrap-rails (2.2.8)
@ -447,7 +445,7 @@ GEM
railties (>= 3.1)
twitter-text (1.13.4)
unf (~> 0.1.0)
tzinfo (1.2.2)
tzinfo (1.2.3)
thread_safe (~> 0.1)
uglifier (3.1.3)
execjs (>= 0.3.0, < 3)
@ -462,7 +460,6 @@ GEM
binding_of_caller (>= 0.7.2)
railties (>= 4.0)
sprockets-rails (>= 2.0, < 4.0)
websocket (1.2.3)
whenever (0.9.7)
chronic (>= 0.6.3)
wikicloth (0.8.3)
@ -490,6 +487,7 @@ DEPENDENCIES
capistrano-rails
capistrano-rvm
capybara
capybara-webkit
connection_pool
coveralls
daemons
@ -537,7 +535,6 @@ DEPENDENCIES
ruby-units
sass-rails
select2-rails
selenium-webdriver
simple-navigation (~> 3.14.0)
simple-navigation-bootstrap
simple_form