Keeping Foundation 4 and 5 parallel

Gemfile

@@ -49,6 +49,7 @@ group :assets do
   gem 'uglifier', '>= 1.0.3'
 
   gem 'turbo-sprockets-rails3'
+
   gem "foundation-rails"
 end
 gem 'foundation_rails_helper', github: 'willrjmarshall/foundation_rails_helper', branch: "rails3"

Gemfile.lock

@@ -179,20 +179,18 @@ GEM
       multi_json (~> 1.0)
     builder (3.0.4)
     cancan (1.6.8)
-    capybara (2.0.2)
+    capybara (2.2.1)
       mime-types (>= 1.16)
       nokogiri (>= 1.3.3)
       rack (>= 1.0.0)
       rack-test (>= 0.5.4)
-      selenium-webdriver (~> 2.0)
-      xpath (~> 1.0.0)
+      xpath (~> 2.0)
     celluloid (0.15.2)
       timers (~> 1.1.0)
-    childprocess (0.3.9)
-      ffi (~> 1.0, >= 1.0.11)
     chunky_png (1.3.0)
     climate_control (0.0.3)
       activesupport (>= 3.0)
+    cliver (0.3.2)
     cocaine (0.5.1)
       climate_control (>= 0.0.3, < 1.0)
     coderay (1.0.9)
@@ -251,10 +249,8 @@ GEM
       railties (>= 3.0.0)
     faker (1.0.1)
       i18n (~> 0.4)
-    faye-websocket (0.4.7)
-      eventmachine (>= 0.12.0)
     ffaker (1.15.0)
-    ffi (1.9.0)
+    ffi (1.9.3)
     fog (1.14.0)
       builder
       excon (~> 0.25.0)
@@ -337,7 +333,7 @@ GEM
       net-ssh (>= 2.6.5)
     net-ssh (2.6.8)
     newrelic_rpm (3.6.7.152)
-    nokogiri (1.6.0)
+    nokogiri (1.6.1)
       mini_portile (~> 0.5.0)
     oj (2.1.2)
     orm_adapter (0.4.0)
@@ -347,10 +343,11 @@ GEM
       cocaine (>= 0.0.2)
       mime-types
     pg (0.13.2)
-    poltergeist (1.1.2)
-      capybara (~> 2.0.1)
-      faye-websocket (~> 0.4.4)
-      http_parser.rb (~> 0.5.3)
+    poltergeist (1.5.0)
+      capybara (~> 2.1)
+      cliver (~> 0.3.1)
+      multi_json (~> 1.0)
+      websocket-driver (>= 0.2.0)
     polyamorous (0.5.0)
       activerecord (~> 3.0)
     polyglot (0.3.4)
@@ -424,7 +421,6 @@ GEM
       rspec-expectations (~> 2.14.0)
       rspec-mocks (~> 2.14.0)
     ruby-hmac (0.4.0)
-    rubyzip (0.9.9)
     safe_yaml (0.9.5)
     sass (3.2.18)
     sass-rails (3.2.6)
@@ -433,11 +429,6 @@ GEM
       tilt (~> 1.3)
     select2-rails (3.2.1)
       thor (~> 0.14)
-    selenium-webdriver (2.35.0)
-      childprocess (>= 0.2.5)
-      multi_json (~> 1.0)
-      rubyzip
-      websocket (~> 1.0.4)
     shoulda-matchers (1.1.0)
       activesupport (>= 3.0.0)
     simplecov (0.7.1)
@@ -491,8 +482,8 @@ GEM
     webmock (1.13.0)
       addressable (>= 2.2.7)
       crack (>= 0.3.2)
-    websocket (1.0.7)
-    xpath (1.0.0)
+    websocket-driver (0.3.2)
+    xpath (2.0.0)
       nokogiri (~> 1.3)
     zeus (0.13.3)
       method_source (>= 0.6.7)

app/assets/javascripts/darkswarm/all.js.coffee

@@ -12,5 +12,7 @@
 #= require_tree .
 
 $ ->
+  # Hacky fix for issue - http://foundation.zurb.com/forum/posts/2112-foundation-5100-syntax-error-in-js
+  Foundation.set_namespace = function() {};
   $(document).foundation()
   $(document).foundation({reveal: {animation: 'fade'}})

app/assets/stylesheets/search/auto_complete.css.scss

@@ -1,5 +1,5 @@
-@import "foundation/variables";
-@import "foundation/components/global";
+@import "foundation4/foundation/variables";
+@import "foundation4/foundation/components/global";
 
 ul.ui-autocomplete {
   position: absolute;
@@ -31,4 +31,4 @@ ul.ui-autocomplete {
       background-color: #FFFCB2;
     }
   }
-}
+}

app/assets/stylesheets/search/enteprise_search.css.scss

@@ -1,5 +1,5 @@
-@import "foundation/variables";
-@import "foundation/components/global";
+@import "foundation4/foundation/variables";
+@import "foundation4/foundation/components/global";
 
 .search-result {
   min-height: 3em;
@@ -13,4 +13,4 @@
 
 .with-separator {
   border-bottom: 1px solid #E0E0E0;
-}
+}

app/assets/stylesheets/search/foundation_and_overrides.scss

@@ -380,6 +380,7 @@ $default-float: left;
 // $button-radius: $global-radius;
 // $button-round: $global-rounded;
 
+
 // We use this to set default opacity for disabled buttons.
 
 // $button-disabled-opacity: 0.6;
@@ -1301,7 +1302,7 @@ $topbar-link-font-size: emCalc(16);
 // $topbar-sticky-class: ".sticky";
 
 
-@import 'foundation';
+@import 'foundation4/foundation';
 
 textarea {
   min-height: emCalc(120) !important;

app/assets/stylesheets/search/home.css.scss

@@ -2,10 +2,10 @@
 // They will automatically be included in application.css.
 // You can use Sass (SCSS) here: http://sass-lang.com/
 
-@import "foundation/variables";
-@import "foundation/components/global";
-@import "foundation/components/buttons";
-@import "foundation/components/panels";
+@import "foundation4/foundation/variables";
+@import "foundation4/foundation/components/global";
+@import "foundation4/foundation/components/buttons";
+@import "foundation4/foundation/components/panels";
 
 #postcode_select_box {
   text-align: center;

app/assets/stylesheets/search/products.css.scss

@@ -1,8 +1,8 @@
-@import "foundation/variables";
-@import "foundation/components/global";
+@import "foundation4/foundation/variables";
+@import "foundation4/foundation/components/global";
 
 .products {
   margin: 0, emCalc(20);
   border: 1px solid black;
   padding: emCalc(10);
-}
+}

app/assets/stylesheets/search/temp_landing_page.css.scss

@@ -1,5 +1,5 @@
-@import "foundation/variables";
-@import "foundation/components/global";
+@import "foundation4/foundation/variables";
+@import "foundation4/foundation/components/global";
 
 .landing-page-row {
   padding-top: emCalc(40);

spec/features/consumer/shopping/shopping_spec.rb

@@ -10,8 +10,6 @@ feature "As a consumer I want to shop with a distributor", js: true do
     before do #temporarily using the old way to select distributor
       create_enterprise_group_for distributor
       visit "/"
-      save_and_open_page
-      binding.pry
       click_link distributor.name
     end