Merge pull request RefugeRestrooms#457 from RefugeRestrooms/remove-cu…

…cumber convert cucumber to capybara
DeeDeeG · Nov 3, 2018 · 8ebc653 · 8ebc653
2 parents 9bbfe17 + 68c419c
commit 8ebc653
Show file tree

Hide file tree

Showing 33 changed files with 217 additions and 433 deletions.
diff --git a/.travis.yml b/.travis.yml
@@ -3,4 +3,4 @@ services: docker
 before_install:
   - docker-compose build
 script:
-  - docker-compose run -e "RAILS_ENV=test" web rake db:test:prepare spec cucumber
+  - docker-compose run -e "RAILS_ENV=test" web rake db:test:prepare spec
diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md
@@ -26,7 +26,7 @@ It will be available at localhost:3000
 
 ### 5 Run the Tests
 ```
-docker-compose run -e "RAILS_ENV=test" web rake db:test:prepare spec cucumber
+docker-compose run -e "RAILS_ENV=test" web rake db:test:prepare spec
 ```
 
 ### 6 Optional tasks:

diff --git a/Gemfile b/Gemfile
@@ -7,7 +7,6 @@ gem 'pg_search'
 gem 'sass-rails'
 gem 'bootstrap-sass'
 gem 'haml'
-gem 'rails_12factor'
 gem 'uglifier', '>= 1.3.0'
 gem 'coffee-rails', '~> 4.2'
 gem 'jquery-rails'
@@ -33,19 +32,26 @@ gem 'puma'
 # Upgraded to 1.0.0 for Rails 5.1.4
 gem 'activeadmin', '~> 1.0.0'
 
+group :production do
+  gem 'rails_12factor'
+end
+
 group :development, :test do
   gem 'rspec-rails'
   gem 'factory_bot_rails', '~> 4.8.2'
   gem 'dotenv-rails', '~> 2.2.1'
   gem 'pry'
   gem 'better_errors', '~> 2.4.0'
   gem 'binding_of_caller'
+end
+
+group :development do
   gem 'i18n-debug'
 end
 
 group :test do
   gem 'rake'
-  gem 'cucumber-rails', '~> 1.5.0', require: false
+  gem 'capybara'
   gem 'database_cleaner'
   gem 'simplecov', '~> 0.7.1', require: false
   gem 'poltergeist'

diff --git a/Gemfile.lock b/Gemfile.lock
@@ -63,7 +63,6 @@ GEM
       descendants_tracker (~> 0.0.4)
       ice_nine (~> 0.11.0)
       thread_safe (~> 0.3, >= 0.3.1)
-    backports (3.10.3)
     bcrypt (3.1.11)
     better_errors (2.4.0)
       coderay (>= 1.0.0)
@@ -109,28 +108,6 @@ GEM
     crack (0.4.3)
       safe_yaml (~> 1.0.0)
     crass (1.0.2)
-    cucumber (3.0.1)
-      builder (>= 2.1.2)
-      cucumber-core (~> 3.0.0)
-      cucumber-expressions (~> 4.0.3)
-      cucumber-wire (~> 0.0.1)
-      diff-lcs (~> 1.3)
-      gherkin (~> 4.0)
-      multi_json (>= 1.7.5, < 2.0)
-      multi_test (>= 0.1.2)
-    cucumber-core (3.0.0)
-      backports (>= 3.8.0)
-      cucumber-tag_expressions (>= 1.0.1)
-      gherkin (>= 4.1.3)
-    cucumber-expressions (4.0.4)
-    cucumber-rails (1.5.0)
-      capybara (>= 1.1.2, < 3)
-      cucumber (>= 1.3.8, < 4)
-      mime-types (>= 1.17, < 4)
-      nokogiri (~> 1.5)
-      railties (>= 4, < 5.2)
-    cucumber-tag_expressions (1.0.1)
-    cucumber-wire (0.0.1)
     database_cleaner (1.6.2)
     debug_inspector (0.0.3)
     descendants_tracker (0.0.4)
@@ -159,7 +136,6 @@ GEM
       actionpack (>= 3.2.13)
     formtastic_i18n (0.6.0)
     geocoder (1.2.14)
-    gherkin (4.1.3)
     globalid (0.4.1)
       activesupport (>= 4.2.0)
     grape (0.7.0)
@@ -224,16 +200,12 @@ GEM
       actionmailer (>= 3.2, < 5.2)
       activemodel (>= 3.2, < 5.2)
     method_source (0.9.0)
-    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)
     money (6.9.0)
       i18n (>= 0.6.4, < 0.9)
     multi_json (1.12.2)
-    multi_test (0.1.2)
     multi_xml (0.6.0)
     nio4r (2.1.0)
     nokogiri (1.8.1)
@@ -394,9 +366,9 @@ DEPENDENCIES
   binding_of_caller
   bootstrap-sass
   bugsnag
+  capybara
   coffee-rails (~> 4.2)
   country_select
-  cucumber-rails (~> 1.5.0)
   database_cleaner
   devise (~> 4.3)
   dotenv-rails (~> 2.2.1)

diff --git a/app/views/layouts/_head.html.haml b/app/views/layouts/_head.html.haml
@@ -6,7 +6,7 @@
 %meta{:content => "RefugeRestrooms.org", :name => "author"}/
 %meta{:content => "initial-scale=1, maximum-scale=1", :name => "viewport"}/
 
-%script{:src => "https://maps.googleapis.com/maps/api/js?v=3.exp&libraries=places&key=AIzaSyBXcCrqzMlm-ZmtNQve7AuipNdE4vySUF0"}
+%script{:src => "https://maps.googleapis.com/maps/api/js?v=3.31&libraries=places&key=AIzaSyBXcCrqzMlm-ZmtNQve7AuipNdE4vySUF0"}
 = stylesheet_link_tag "application", media: "all", "data-turbolinks-track" => true
 = javascript_include_tag "application", "data-turbolinks-track" => true
 = csrf_meta_tags

diff --git a/bin/cucumber b/bin/cucumber
diff --git a/config/environments/test.rb b/config/environments/test.rb
@@ -39,4 +39,6 @@
 
   # Raises error for missing translations
   # config.action_view.raise_on_missing_translations = true
+
+  config.log_level = :error
 end
diff --git a/features/contact.feature b/features/contact.feature
diff --git a/features/guess.feature.back b/features/guess.feature.back
diff --git a/features/nearby.feature b/features/nearby.feature
diff --git a/features/preview.feature b/features/preview.feature
diff --git a/features/search.feature b/features/search.feature
diff --git a/features/step_definitions/contact_steps.rb b/features/step_definitions/contact_steps.rb
diff --git a/features/step_definitions/location_steps.rb b/features/step_definitions/location_steps.rb
diff --git a/features/step_definitions/map_steps.rb b/features/step_definitions/map_steps.rb
diff --git a/features/step_definitions/navigation_steps.rb b/features/step_definitions/navigation_steps.rb
diff --git a/features/step_definitions/preview_steps.rb b/features/step_definitions/preview_steps.rb
diff --git a/features/step_definitions/restroom_steps.rb b/features/step_definitions/restroom_steps.rb
diff --git a/features/step_definitions/search_steps.rb b/features/step_definitions/search_steps.rb
diff --git a/features/step_definitions/submission_steps.rb b/features/step_definitions/submission_steps.rb
diff --git a/features/submit.feature b/features/submit.feature