Merge branch 'development' of https://github.com/bikebike/BikeBike into development

Rakefile

@@ -71,6 +71,12 @@ task :i18n do
   end
 end
 
+task 'i18n:debug' do
+  ENV['I18N_DEBUG'] = '1'
+  Rake::Task['i18n'].execute
+  ENV['I18N_DEBUG'] = '0'
+end
+
 task :css do
   ENV['CSS_TEST'] = '1'
   Rake::Task['cucumber:run'].execute

app/assets/stylesheets/_application.scss

@@ -3355,7 +3355,8 @@ body.policy .policy-agreement ul {
             height: 1.25em;
             line-height: 1.25em;
             text-align: center;
-            margin: 0;// 0.3333em 0 0;
+            margin: 0;
+            text-shadow: 0.0333em 0.0333em 0.06667em $black;
         }
     }
 

app/controllers/conferences_controller.rb

@@ -78,7 +78,7 @@ class ConferencesController < ApplicationController
           return redirect_to pp_response.redirect_uri
         end
       end
-
+begin
       # get the current step
       @step = current_registration_step(@this_conference, current_user)
 
@@ -97,6 +97,11 @@ class ConferencesController < ApplicationController
       result = registration_step(@step, @this_conference, current_user)
       # pass any data on to the view
       data_to_instance_variables(result)
+rescue Exception => e
+  puts e
+  puts e.backtrace.join("\n")
+  raise e
+end
     end
 
     if request.xhr?

features/support/factory_girl.rb

@@ -111,6 +111,10 @@ def create_registration(user = TestState.my_account)
     'group_ride' => true
   }
   registration.housing_data = { 'other' => '', 'companion' => false }
+  
+  registration.city_id = City.search('Los Angeles').id unless City.exists?(registration.city_id)
+  registration.data['city_id'] = City.search('Montreal').id unless City.exists?(registration.data['city_id'])
+
   registration.save!
 
   if user == TestState.my_account

features/support/location_cache.yml

@@ -1,51 +0,0 @@
----
-Brooklyn NY: !ruby/object:Geocoder::Result::Google
-  data:
-    address_components:
-    - long_name: Brooklyn
-      short_name: Brooklyn
-      types:
-      - political
-      - sublocality
-      - sublocality_level_1
-    - long_name: Kings County
-      short_name: Kings County
-      types:
-      - administrative_area_level_2
-      - political
-    - long_name: New York
-      short_name: NY
-      types:
-      - administrative_area_level_1
-      - political
-    - long_name: United States
-      short_name: US
-      types:
-      - country
-      - political
-    formatted_address: Brooklyn, NY, USA
-    geometry:
-      bounds:
-        northeast:
-          lat: 40.739446
-          lng: -73.8333651
-        southwest:
-          lat: 40.551042
-          lng: -74.05663
-      location:
-        lat: 40.6781784
-        lng: -73.9441579
-      location_type: APPROXIMATE
-      viewport:
-        northeast:
-          lat: 40.739446
-          lng: -73.8333651
-        southwest:
-          lat: 40.551042
-          lng: -74.05663
-    place_id: ChIJCSF8lBZEwokRhngABHRcdoI
-    types:
-    - political
-    - sublocality
-    - sublocality_level_1
-  cache_hit: