dev env changes - added turnip, selenium, configs

YaroSpace · YaroSpace · commit c8fe78a114d2 · 2014-11-03T15:56:10.000Z
diff --git a/.rspec b/.rspec
@@ -1,4 +1,5 @@
 --require spec_helper
+--require turnip/rspec
 --format Fuubar
 --color
 --profile
diff --git a/.rspec-local b/.rspec-local
@@ -0,0 +1,4 @@
+--require spec_helper
+--format documentation
+--color
+--no-profile
diff --git a/Gemfile b/Gemfile
@@ -169,8 +169,10 @@ group :test do
   # gem 'rspec-its'
   gem 'capybara'
   gem 'capybara-screenshot'
+  gem 'turnip' # write rspec feature specs in cucumber style
   gem 'rack_session_access' # allows to set session from within Capybara
   gem 'poltergeist' # headless js driver for Capybara that uses phantomJs
+  gem 'selenium-webdriver' # headfull js driver for Capybara
   gem 'codeclimate-test-reporter', require: false
   gem 'database_cleaner'
   gem 'fuubar', '2.0.0.rc1'
diff --git a/Gemfile.lock b/Gemfile.lock
@@ -137,6 +137,8 @@ GEM
       carrierwave (~> 0.5)
     celluloid (0.15.2)
       timers (~> 1.1.0)
+    childprocess (0.5.5)
+      ffi (~> 1.0, >= 1.0.11)
     choice (0.1.6)
     chronic (0.10.2)
     chunky_png (1.3.1)
@@ -277,6 +279,8 @@ GEM
       multi_json (~> 1.0)
       net-http-persistent (>= 2.7)
       net-http-pipeline
+    gherkin (2.12.2)
+      multi_json (~> 1.3)
     github-markdown (0.6.6)
     grackle (0.3.0)
       json
@@ -591,6 +595,7 @@ GEM
     ruby-progressbar (1.5.1)
     ruby_parser (3.6.2)
       sexp_processor (~> 4.1)
+    rubyzip (1.1.6)
     safe_yaml (1.0.3)
     sanitize (3.0.0)
       crass (~> 0.2.0)
@@ -606,6 +611,11 @@ GEM
       faraday (~> 0.8, < 0.10)
     sax-machine (0.2.1)
       nokogiri (~> 1.6.0)
+    selenium-webdriver (2.43.0)
+      childprocess (~> 0.5)
+      multi_json (~> 1.0)
+      rubyzip (~> 1.0)
+      websocket (~> 1.0)
     sexp_processor (4.4.4)
     shoulda-matchers (2.6.2)
       activesupport (>= 3.0.0)
@@ -686,6 +696,9 @@ GEM
     treetop (1.4.15)
       polyglot
       polyglot (>= 0.3.1)
+    turnip (1.2.4)
+      gherkin (>= 2.5)
+      rspec (>= 2.14.0, < 4.0)
     tweet-button (0.1.0)
     twitter (5.5.1)
       addressable (~> 2.3)
@@ -813,6 +826,7 @@ DEPENDENCIES
   sanitize
   sass (~> 3.2.9)
   sass-rails (~> 3.2.6)
+  selenium-webdriver
   shoulda-matchers
   sidekiq
   simple_form
@@ -829,6 +843,7 @@ DEPENDENCIES
   timecop
   tire
   travis
+  turnip
   tweet-button
   twitter
   uglifier (>= 1.0.3)
diff --git a/app/controllers/application_controller.rb b/app/controllers/application_controller.rb
@@ -21,6 +21,9 @@ class ApplicationController < ActionController::Base
   after_action :record_visit
   after_action :record_location
 
+  rescue_from ActiveRecord::RecordNotFound, with: :render_404 unless Rails.env.production?
+  rescue_from ActionController::RoutingError, with: :render_404 unless Rails.env.production?
+
   protected
 
   def apply_flash_message
@@ -179,9 +182,6 @@ def not_on_achievements?
     params[:controller] != 'achievements'
   end
 
-  rescue_from ActiveRecord::RecordNotFound, with: :render_404
-  rescue_from ActionController::RoutingError, with: :render_404
-
   def render_404
     render template: 'error/not_found', status: :not_found
   end
diff --git a/config/environments/test.rb b/config/environments/test.rb
@@ -13,9 +13,8 @@
 
   # Allow pass debug_assets=true as a query parameter to load pages with unpackaged assets
   config.assets.allow_debugging = true
-
-  config.middleware.use RackSessionAccess::Middleware # alloes to set session from within Capybara
+  config.middleware.use RackSessionAccess::Middleware # allows to set session from within Capybara
 
   Rails.logger = Logger.new(STDOUT)
-  Rails.logger.level = Logger::DEBUG # provides more verbose output when testing with headless browsers in case of errors
+  Rails.logger.level = Logger::DEBUG
 end
diff --git a/spec/rails_helper.rb b/spec/rails_helper.rb
@@ -1,6 +1,8 @@
 require 'spec_helper.rb'
 require 'capybara/poltergeist'
+require 'capybara-screenshot/rspec'
 require 'rack_session_access/capybara'
+require 'features/helpers/general_helpers.rb'
 
 Capybara.javascript_driver = :poltergeist
 Capybara.default_wait_time = 5
diff --git a/spec/turnip_helper.rb b/spec/turnip_helper.rb
@@ -0,0 +1,4 @@
+require 'rails_helper.rb'
+require 'turnip/capybara'
+
+Dir.glob("spec/features/steps/**/*steps.rb") { |file| load file, true }
