Pump rails version, fix tests

bin/setup

@@ -1,33 +1,36 @@
 #!/usr/bin/env ruby
 require 'pathname'
-require 'fileutils'
+include FileUtils
 
 # path to your application root.
 APP_ROOT = Pathname.new File.expand_path('../../', __FILE__)
 
-
 def system!(*args)
   system(*args) || abort("\n== Command #{args} failed ==")
 end
 
-Dir.chdir APP_ROOT do
+chdir APP_ROOT do
+  # This script is a starting point to setup your application.
+  # Add necessary setup steps to this file.
 
-  puts '== Installing dependencies with bundler =='
+  puts '== Installing dependencies =='
   system! 'gem install bundler --conservative'
   system('bundle check') || system!('bundle install')
 
-  puts "\n== Copying sample development database config files =="
-  unless File.exist?('config/database.yml')
-    system! 'cp config/database-example-development.yml config/database.yml'
-  end
+  # Install JavaScript dependencies if using Yarn
+  # system('bin/yarn')
+
+   puts "\n== Copying sample files =="
+   unless File.exist?('config/database.yml')
+     system! 'cp config/database.yml.sample config/database.yml'
+   end
 
   puts "\n== Preparing database =="
   system! 'bin/rails db:setup'
 
   puts "\n== Removing old logs and tempfiles =="
-  system! 'bin/rake log:clear tmp:clear'
+  system! 'bin/rails log:clear tmp:clear'
 
   puts "\n== Restarting application server =="
-  system! 'touch tmp/restart.txt'
-
+  system! 'bin/rails restart'
 end