From d7adc32c2ce05edbb292868709de6bbe462c13b1 Mon Sep 17 00:00:00 2001
From: Benjamin ter Kuile <bterkuile@gmail.com>
Date: Mon, 14 Jul 2014 16:35:32 +0200
Subject: [PATCH] specs in the green

---
 config/application.rb                 | 2 +-
 spec/models/supplier_spec.rb          | 1 +
 spec/routing/locale_routing_spec.rb   | 2 +-
 spec/routing/supplier_routing_spec.rb | 2 +-
 spec/routing/user_routing_spec.rb     | 2 +-
 wip.md                                | 3 +++
 6 files changed, 8 insertions(+), 4 deletions(-)

diff --git a/config/application.rb b/config/application.rb
index 1f472b6b..b8fc8690 100644
--- a/config/application.rb
+++ b/config/application.rb
@@ -16,7 +16,7 @@ require File.expand_path('./../../lib/couchbase-setting', __FILE__)
 if defined?(Bundler)
   # If you precompile assets before deploying to production, use this line
   Bundler.require(*Rails.groups(assets: %w(development test)))
-  Bundler.require(:assets) if ENV['QWAITER_MOBILE_EXPORT']='yes'
+  Bundler.require(:assets) if ENV['QWAITER_MOBILE_EXPORT']=='yes'
   # If you want your assets lazily compiled in production, use this line
   # Bundler.require(:default, :assets, Rails.env)
 end
diff --git a/spec/models/supplier_spec.rb b/spec/models/supplier_spec.rb
index 1e4194bd..da7a627f 100644
--- a/spec/models/supplier_spec.rb
+++ b/spec/models/supplier_spec.rb
@@ -24,6 +24,7 @@ describe Supplier do
       Qwaiter::Counter.set "supplier_counter:#{supplier.id}:orders_placed", 9
       supplier.orders_placed_count.should == 9
       Supplier.reset_counters!
+      sleep 0.5
       supplier.orders_placed_count.should == 0
       Qwaiter::Counter.connection = old_connection
     end
diff --git a/spec/routing/locale_routing_spec.rb b/spec/routing/locale_routing_spec.rb
index 651400c9..c3c10a87 100644
--- a/spec/routing/locale_routing_spec.rb
+++ b/spec/routing/locale_routing_spec.rb
@@ -1,6 +1,6 @@
 require "spec_helper"
 
-describe "routing" do
+describe "routing", type: :routing do
   it('roots to pages#home'){get('/').should route_to('pages#home', locale: 'nl')}
   it('roots to pages#home for en locale'){get('/en').should route_to('pages#home', locale: 'en')}
   it('handles about page as root'){ get('/about').should route_to('pages#show', name: 'about', locale: 'nl')}
diff --git a/spec/routing/supplier_routing_spec.rb b/spec/routing/supplier_routing_spec.rb
index c5040975..210d5c28 100644
--- a/spec/routing/supplier_routing_spec.rb
+++ b/spec/routing/supplier_routing_spec.rb
@@ -1,6 +1,6 @@
 require "spec_helper"
 
-describe SupplierController do
+describe SupplierController, type: :routing do
   describe "routing" do
 
     it "routes root to #home" do
diff --git a/spec/routing/user_routing_spec.rb b/spec/routing/user_routing_spec.rb
index 1f16e773..005ee947 100644
--- a/spec/routing/user_routing_spec.rb
+++ b/spec/routing/user_routing_spec.rb
@@ -1,6 +1,6 @@
 require "spec_helper"
 
-describe UserController do
+describe UserController, type: :routing do
   describe "routing" do
 
     it "routes root to #index" do
diff --git a/wip.md b/wip.md
index 28cc02e1..d9672d43 100644
--- a/wip.md
+++ b/wip.md
@@ -43,10 +43,13 @@ Release
 General:
 - search for class btn and replace with font awesome correct styling if
   needed
+- theme1 site alert styling (zurb?)
+- devise styling
 Bugs:
   - Dragging supplier table from one section to the other fails
   - Supplier section print qr codes does not give proper images
   - Supplier tables pagination styling
+  - supplier counters in user view (no supplier in active list?)
 
 Post release
 ------------