diff --git a/Gemfile b/Gemfile
index db0651f..abaceae 100644
--- a/Gemfile
+++ b/Gemfile
@@ -48,14 +48,14 @@ group :development do
   gem 'spring-commands-rspec'
   gem 'guard-ctags-bundler'
 end
-group :development, :test do
+group :development, :test, :staging do
   gem 'factory_girl_rails'
   gem 'faker'
   gem 'pry-rails'
   gem 'pry-rescue'
   gem 'rspec-rails'
 end
-group :test do
+group :test, :staging do
   gem 'capybara'
   gem 'database_cleaner'
   gem "poltergeist"
diff --git a/config/deploy.rb b/config/deploy.rb
index c9d7a0b..e41442b 100644
--- a/config/deploy.rb
+++ b/config/deploy.rb
@@ -19,7 +19,7 @@ set :linked_files, %w{config/database.yml .env}
 set :linked_dirs, %w{log tmp/pids tmp/cache tmp/sockets vendor/bundle public/system public/lift-calculator}
 
 set :rbenv_type, :user # or :system, depends on your rbenv setup
-set :rbenv_ruby, '2.2.3'
+set :rbenv_ruby, '2.3.0'
 set :rbenv_prefix, "RBENV_ROOT=#{fetch(:rbenv_path)} RBENV_VERSION=#{fetch(:rbenv_ruby)} #{fetch(:rbenv_path)}/bin/rbenv exec"
 set :rbenv_map_bins, %w{rake gem bundle ruby rails}
 set :rbenv_roles, :all # default value
diff --git a/spec/features/plays_spec.rb b/spec/features/plays_spec.rb
index 01e3f19..9fcecd2 100644
--- a/spec/features/plays_spec.rb
+++ b/spec/features/plays_spec.rb
@@ -7,7 +7,8 @@ feature 'Play a hand', type: :feature, js: true do
     @game = setup_game
     @game.reload
     @player = @game.controlling_player
-    login_as(@player.user, scope: :user)
+    signin(@player.user.email,'please123')
+    #login_as(@player.user, scope: :user)
     visit game_path @game
   end
 
diff --git a/spec/support/capybara.rb b/spec/support/capybara.rb
index 75cab66..1fca18e 100644
--- a/spec/support/capybara.rb
+++ b/spec/support/capybara.rb
@@ -1,3 +1,15 @@
 require 'capybara/poltergeist'
-Capybara.asset_host = 'http://localhost:3000'
-Capybara.javascript_driver = :poltergeist #:selenium
+
+asset_hosts = {
+  staging: 'http://staging.tienlen.ga',
+  development: 'http://localhost:3000',
+  test: 'http://localhost:3000'
+}
+
+if ENV['RAILS_ENV'] == 'staging'
+  #Capybara.run_server = false
+  Capybara.app_host = asset_hosts[ENV['RAILS_ENV'].to_sym]
+end
+Capybara.asset_host = asset_hosts[ENV['RAILS_ENV'].to_sym]
+#Capybara.asset_host = 'http://localhost:3000'
+Capybara.javascript_driver = :selenium # :poltergeist