diff --git a/Gemfile.lock b/Gemfile.lock
index 4951b40..c9c353d 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -46,6 +46,19 @@ GEM
       builder
     builder (2.1.2)
     cancan (1.6.4)
+    capybara (0.4.1.2)
+      celerity (>= 0.7.9)
+      culerity (>= 0.2.4)
+      mime-types (>= 1.16)
+      nokogiri (>= 1.3.3)
+      rack (>= 1.0.0)
+      rack-test (>= 0.5.4)
+      selenium-webdriver (>= 0.0.27)
+      xpath (~> 0.1.3)
+    celerity (0.8.9)
+    childprocess (0.1.9)
+      ffi (~> 1.0.6)
+    culerity (0.2.15)
     devise (1.3.3)
       bcrypt-ruby (~> 2.1.2)
       orm_adapter (~> 0.0.3)
@@ -54,13 +67,16 @@ GEM
       rails (>= 3.0.0)
     erubis (2.6.6)
       abstract (>= 1.0.0)
+    factory_girl (2.0.0.beta2)
     faker (0.9.5)
       i18n (~> 0.4)
+    ffi (1.0.8)
     highline (1.5.1)
     i18n (0.5.0)
     jquery-rails (0.2.6)
       rails (~> 3.0)
       thor (~> 0.14.4)
+    json_pure (1.5.1)
     mail (2.2.19)
       activesupport (>= 2.3.6)
       i18n (>= 0.4.0)
@@ -75,6 +91,7 @@ GEM
     nested_set (1.6.4)
       activerecord (>= 3.0.0)
       railties (>= 3.0.0)
+    nokogiri (1.4.4)
     orm_adapter (0.0.5)
     paperclip (2.3.8)
       activerecord
@@ -104,6 +121,12 @@ GEM
       activesupport (~> 3.0)
     rd_resource_controller (1.0.1)
     rd_unobtrusive_date_picker (0.1.0)
+    rubyzip (0.9.4)
+    selenium-webdriver (0.2.0)
+      childprocess (>= 0.1.7)
+      ffi (>= 1.0.7)
+      json_pure
+      rubyzip
     shoulda (2.11.3)
     spork (0.9.0.rc7)
     spork-testunit (0.0.5)
@@ -140,13 +163,18 @@ GEM
     warden (1.0.4)
       rack (>= 1.0)
     will_paginate (3.0.pre2)
+    xpath (0.1.4)
+      nokogiri (~> 1.3)
 
 PLATFORMS
   ruby
 
 DEPENDENCIES
+  capybara (>= 0.4.1)
   dummier (>= 0.1.0)
+  factory_girl (>= 2.0.0.beta2)
   faker (>= 0.9.5)
+  selenium-webdriver (>= 0.2.0)
   shoulda (>= 2.11.3)
   spork (>= 0.9.0.rc5)
   spork-testunit (>= 0.0.5)
diff --git a/app/controllers/admin/wholesaler_states_controller.rb b/app/controllers/admin/wholesaler_states_controller.rb
new file mode 100644
index 0000000..1e1a03a
--- /dev/null
+++ b/app/controllers/admin/wholesaler_states_controller.rb
@@ -0,0 +1,13 @@
+class Admin::WholesalerStatesController < Admin::BaseController
+
+  def index
+    #params[:prefix] = params[:prefix].to_s.downcase
+    #prefix = %w(bill ship).include?(params[:prefix]) ? params[:prefix] : "bill"
+    if params[:country_id]
+      @country = Country.includes(:states).find(params[:country_id]) rescue nil
+      @states  = @country.states.order(:name).all if @country
+    end
+    render :partial => "admin/wholesalers/state_field", :locals => { :states => @states }
+  end
+
+end
diff --git a/app/controllers/admin/wholesalers_controller.rb b/app/controllers/admin/wholesalers_controller.rb
index 475fbbc..f04f347 100644
--- a/app/controllers/admin/wholesalers_controller.rb
+++ b/app/controllers/admin/wholesalers_controller.rb
@@ -1,22 +1,19 @@
-class Admin::WholesalersController < Admin::BaseController
-  
-  resource_controller
+class Admin::WholesalersController < Admin::ResourceController
   
   include SpreeWholesale::WholesalerController
   
-  #before_filter :check_json_authenticity, :only => :index
+  before_filter :approval_setup, :only => [ :approve, :reject ]
   
-  index.response do |wants|
-    wants.html { render :action => :index }
-    wants.json { render :json => json_data }
+  def after_wholesaler_create
+    flash[:notice] = t('admin.wholesalers.success')
+    redirect_to admin_wholesalers_path
   end
-
-  destroy.success.wants.js { render_js_for_destroy }
-
-
-  before_filter :approval_setup, :only => [ :approve, :reject ]
-
-
+  
+  def after_wholesaler_failed_create
+    flash[:error] = t('admin.wholesalers.failed')
+    render :action => :new
+  end
+  
   def approve
     return redirect_to request.referer, :flash => { :error => "Wholesaler is already active." } if @wholesaler.active?
     @wholesaler.activate!
@@ -33,47 +30,14 @@ def approval_setup
     @wholesaler = Wholesaler.find(params[:id])
     @role = Role.find_by_name("wholesaler")
   end
-
-
+    
   private
   
     def collection
       params[:search] ||= {}
       params[:search][:meta_sort] ||= "company.asc"
-      @search = end_of_association_chain.metasearch(params[:search])
+      @search = Wholesaler.search(params[:search])
       @collection = @search.paginate(:per_page => Spree::Config[:admin_products_per_page], :page => params[:page])
     end
  
 end
-
-  ## Allow different formats of json data to suit different ajax calls
-  #def json_data
-  #  json_format = params[:json_format] or 'default'
-  #  case json_format
-  #  when 'basic'
-  #    collection.map {|u| {'id' => u.id, 'name' => u.email}}.to_json
-  #  else
-  #    collection.to_json(:include =>
-  #      {:bill_address => {:include => [:state, :country]},
-  #      :ship_address => {:include => [:state, :country]}})
-  #  end
-  #end
-
-  #def collection
-  #  return @collection if @collection.present?
-  #  unless request.xhr?
-  #    @search = Wholesaler.searchlogic(params[:search])
-  #
-  #    #set order by to default or form result
-  #    @search.order ||= "ascend_by_email"
-  #
-  #    @collection = @search.do_search.includes(:user => [:roles]).paginate(:per_page => Spree::Config[:admin_products_per_page], :page => params[:page])
-  #
-  #    #scope = scope.conditions "lower(email) = ?", @filter.email.downcase unless @filter.email.blank?
-  #  else
-  #    @collection = Wholesaler.includes(:user => [:roles], :bill_address => [:state, :country],
-  #                                :ship_address => [:state, :country]).where("wholesalers.company like :search",
-  #                                                                             {:search => "#{params[:q].strip}%"}).limit(params[:limit] || 100)
-  #  end
-  #end  
-#end
diff --git a/app/models/order_decorator.rb b/app/models/order_decorator.rb
index c5ae796..d5ba3fe 100644
--- a/app/models/order_decorator.rb
+++ b/app/models/order_decorator.rb
@@ -27,6 +27,12 @@ def to_fullsale!
   end
     
   def to_wholesale!
+    
+    puts "user.wholesaler"
+    puts user.wholesaler
+    
+    
+    return false unless user.wholesaler.present?
     self.wholesale = true
     set_line_item_prices(:wholesale_price)
     update!
diff --git a/app/models/user_decorator.rb b/app/models/user_decorator.rb
index 4ffc4b1..501bbb0 100644
--- a/app/models/user_decorator.rb
+++ b/app/models/user_decorator.rb
@@ -7,7 +7,7 @@
 User.class_eval do 
   
   def wholesaler?
-    has_role?("wholesaler")
+    has_role?("wholesaler") && !wholesaler.nil?
   end
   
 end
\ No newline at end of file
diff --git a/app/models/wholesaler.rb b/app/models/wholesaler.rb
index bc1feb9..b8a89e2 100644
--- a/app/models/wholesaler.rb
+++ b/app/models/wholesaler.rb
@@ -1,21 +1,22 @@
 class Wholesaler < ActiveRecord::Base
   
-  belongs_to :user
+  partial_updates = false
   
-  belongs_to :ship_address, :foreign_key => "shipping_address_id", :class_name => "Address"
-  belongs_to :bill_address, :foreign_key => "billing_address_id", :class_name => "Address"
-  
-  validates_presence_of [ :company, :buyer_contact, :manager_contact, :phone, :taxid ]
-
-  validates_each :user_id, :billing_address_id, :shipping_address_id do |record,attr,value|
-    record.errors.add attr, 'must not contain any errors.' if value.to_i == 0
-  end
+  belongs_to :user, :dependent => :destroy  
+  belongs_to :bill_address, :foreign_key => "billing_address_id", :class_name => "Address", :dependent => :destroy
+  belongs_to :ship_address, :foreign_key => "shipping_address_id", :class_name => "Address", :dependent => :destroy
   
+  validates :company, :buyer_contact, :manager_contact, :phone, :taxid, :presence => true
+  validate :validate_parts
+    
   delegate_belongs_to :user, :roles
   delegate_belongs_to :user, :email
-  
-  def self.term_options
-    %(Net 10, Net 15, Net 30, COD, Credit Card).split(", ")
+    
+  def validate_parts
+    uv = user && user.valid? 
+    bv = bill_address && bill_address.valid?
+    sv = ship_address && ship_address.valid?
+    self.errors.add(:base, I18n.t("wholesaler.parts_error_message")) unless uv && bv && sv
   end
     
   def activate!
@@ -36,6 +37,10 @@ def active?
     user && user.has_role?("wholesaler")
   end
   
+  def self.term_options
+    %(Net 10, Net 15, Net 30, COD, Credit Card).split(", ")
+  end
+  
   private
   
     def get_wholesale_role
diff --git a/app/views/admin/wholesalers/_form.html.erb b/app/views/admin/wholesalers/_form.html.erb
index 20a21e9..a1ee40f 100644
--- a/app/views/admin/wholesalers/_form.html.erb
+++ b/app/views/admin/wholesalers/_form.html.erb
@@ -4,8 +4,29 @@
   <%= hook :admin_wholesaler_form_fields, locals do %>
   
   <%= render "shared/error_messages", :target => @wholesaler %>
+
   
-  <fieldset>
+  <fieldset class="user-details">
+    <legend>User Details:</legend>
+    <% if @user.new_record? %>
+      <%= fields_for :user, @user do |uf| %>
+        <%= render "shared/error_messages", :target => @user %>
+        <%= render 'admin/users/form', :f => uf %>
+      <% end %>
+    <% else %>
+    <p>
+      <b>User Id:</b>
+      <%= link_to @user.id, admin_user_path(@user) %>
+      <br/>
+      <%= link_to "view user", admin_user_path(@user) %> / 
+      <%= link_to "edit user", edit_admin_user_path(@user) %> /
+      <%= render "user_options" %>      
+    </p>
+    <% end %>
+  </fieldset>
+  
+  
+  <fieldset class="wholesaler-details">
     <legend>Wholesaler Details:</legend>
   
     <%= f.field_container :company do %>
@@ -71,32 +92,11 @@
   </fieldset>
   <% end %>
   
-  
-  <fieldset>
-    <legend>User Details:</legend>
-    <% if @user.new_record? %>
-      <%= fields_for :user, @user do |uf| %>
-        <%= render "shared/error_messages", :target => @user %>
-        <%= render 'admin/users/form', :f => uf %>
-      <% end %>
-    <% else %>
-    <p>
-      <b>User Id:</b>
-      <%= link_to @user.id, admin_user_path(@user) %>
-      <br/>
-      <%= link_to "view user", admin_user_path(@user) %> / 
-      <%= link_to "edit user", edit_admin_user_path(@user) %> /
-      <%= render "user_options" %>      
-    </p>
-    <% end %>
-  </fieldset>
-  
-  
 </div>
 
 <div class="rightie">
   
-  <fieldset>
+  <fieldset class="billing-details">
     <legend>Billing Address Details:</legend>
     <%= fields_for :bill_address, @bill_address do |af| %>
       <%= render "shared/error_messages", :target => @bill_address %>
@@ -105,29 +105,19 @@
   </fieldset>
   
   
-  <fieldset id="fields_ship_address">
+  <fieldset class="shipping-details" id="fields_ship_address">
     <legend>Shipping Address Details:</legend>
     <%= fields_for :ship_address, @ship_address do |af| %>
       <%= render "shared/error_messages", :target => @ship_address %>
-      <%= render 'shared/address_form', :form => af, :address => @ship_address %>
+      <%= render 'shared/address_form',   :form => af, :address => @ship_address %>
     <% end %>
   </fieldset>
   
 </div>
-<script type="text/javascript">
-//<![CDATA[
 
-	$('#wholesaler_use_billing').change(function(evt) {
-    $('#fields_ship_address').css('display', $(this).is(':checked') ? 'none' : 'block');
-  }).change();   
-  
-  <% unless @ship_address.new_record? || @bill_address != @ship_address %>
-    $('#wholesaler_use_billing').attr('checked', true);
-  <% end %>  
-   
-//]]>
-</script>
+
 
 <% content_for :head do %>
   <%= stylesheet_link_tag 'admin/wholesalers' %>
-<% end %>
\ No newline at end of file
+  <%= javascript_include_tag 'admin/wholesaler_address' %> 
+<% end %>
diff --git a/app/views/admin/wholesalers/_state_field.html.erb b/app/views/admin/wholesalers/_state_field.html.erb
new file mode 100644
index 0000000..b5e4ede
--- /dev/null
+++ b/app/views/admin/wholesalers/_state_field.html.erb
@@ -0,0 +1,8 @@
+<% states ||= [] %>
+<% prefix ||= '' %>
+<% value  ||= '' %>
+<% unless states.empty? %>
+  <%= select_tag "#{prefix}_address[state_id]", options_for_select(states.map{|s| [s.name, s.id]}, value.is_a?(Address) ? value.state.id : value), :class => 'required' %>
+<% else %>
+  <%= text_field_tag "#{prefix}_address[state_name]", value.is_a?(Address) ? value.state_name : value, :class => 'text required' %>
+<% end %>
diff --git a/app/views/admin/wholesalers/edit.html.erb b/app/views/admin/wholesalers/edit.html.erb
index 1aaaac1..8e1670f 100644
--- a/app/views/admin/wholesalers/edit.html.erb
+++ b/app/views/admin/wholesalers/edit.html.erb
@@ -3,7 +3,7 @@
 <% end %>
 
 <%= hook :admin_wholesaler_edit_form do %>
-  <%= form_for(:wholesaler, :url => object_url, :html => { :method => :put }) do |f| %>
+  <%= form_for [:admin, @wholesaler], :html => { :class => "wholesaler-form" } do |f| %>
     <%= render :partial => "form", :locals => { :f => f } %>
 
     <%= hook :admin_wholesaler_edit_form_buttons do %>
diff --git a/app/views/admin/wholesalers/new.html.erb b/app/views/admin/wholesalers/new.html.erb
index bb5b453..6cbb4bb 100644
--- a/app/views/admin/wholesalers/new.html.erb
+++ b/app/views/admin/wholesalers/new.html.erb
@@ -3,7 +3,7 @@
 <% end %>
 
 <%= hook :admin_wholesaler_new_form do %>
-  <%= form_for(:wholesaler, :url => collection_url) do |f| %>
+  <%= form_for [:admin, @wholesaler], :html => { :class => "wholesaler-form" } do |f| %>
     <%= render :partial => "form", :locals => { :f => f } %>
 
     <%= hook :admin_wholesaler_new_form_buttons do %>
diff --git a/app/views/hooks/_wholesale_customer.html.erb b/app/views/hooks/_wholesale_customer.html.erb
new file mode 100644
index 0000000..b011e8d
--- /dev/null
+++ b/app/views/hooks/_wholesale_customer.html.erb
@@ -0,0 +1,5 @@
+<% if @user.wholesaler? %>
+  <h1>Wholesaler</h1>
+  <h4 class="wholesale-customer-id"><%= t('wholesale_customer', { :id => @user.id }) %></h4>
+  <h4 class="wholesale-customer-id"><%= t('wholesale_customer_since', { :time => @user.wholesaler.created_at }) %></h4>
+<% end %>
diff --git a/app/views/shared/_address_form.html.erb b/app/views/shared/_address_form.html.erb
index f272fc0..2b32e24 100644
--- a/app/views/shared/_address_form.html.erb
+++ b/app/views/shared/_address_form.html.erb
@@ -7,7 +7,7 @@
 </p>
 <p>
   <%= form.label :lastname, t(billing ? 'billing_lastname' : 'shipping_lastname') %><br/>
-  <%= form.text_field :lastname %>
+  <%= form.text_field :lastname, :class => 'required' %><span class="req">*</span>
 </p>
 <p>
   <%= form.label :address1, t(:street_address) %><br/>
@@ -22,30 +22,10 @@
   <%= form.text_field :city, :class => 'required' %><span class="req">*</span>
 </p>
 <% if Spree::Config[:address_requires_state] %>
-  <p>
-    <span id="bstate">
-      <% have_states = !address.country.states.empty? %>
-      <%= form.label :state, t(:state) %><br/>
-      <noscript>
-        <%= form.text_field :state_name, :class => 'required' %>
-      </noscript>
-      <% state_elements = [
-         form.collection_select(:state_id, address.country.states,
-                            :id, :name,
-                            {:include_blank => true},
-                            {:class => have_states ? "required" : "hidden",
-                            :disabled => !have_states}) +
-          form.text_field(:state_name,
-                            :class => !have_states ? "required" : "hidden",
-                            :disabled => have_states)
-          ].join.gsub('"', "'").gsub("\n", "")
-      %>
-      <script type="text/javascript" language="javascript" charset="utf-8">
-      // <![CDATA[
-      document.write("<%= raw state_elements %>");
-      // ]]>
-      </script>
-    </span>
+  <p class="state-select" id="state_for_<%= billing ? 'bill' : 'ship' %>_address">
+    <% have_states = !address.country.states.empty? %>
+    <%= form.label :state_id, t(:state) %><br/>
+    <span class="field"><%= render 'state_field', :prefix => billing ? 'bill' : 'ship', :value => address, :states => address.country.states.sort %></span>
     <span class="req">*</span>
   </p>
 <% end %>
@@ -55,19 +35,16 @@
 </p>
 <p>
   <%= form.label :country_id, t(:country) %><br/>
-  <span id="bcountry"><%= form.collection_select :country_id, Country.all, :id, :name, {}, {:class => 'required'} %></span>
+  <span id="<%= (billing ? "b" : "s") + "country" %>">
+    <%= form.collection_select :country_id, Country.all, :id, :name, {}, { :class => 'country-select required' } %>
+  </span>
   <span class="req">*</span>
 </p>
 <p>
   <%= form.label :phone, t(:phone) %><br/>
   <%= form.text_field :phone, :class => 'required' %><span class="req">*</span>
 </p>
-<% if Spree::Config[:alternative_billing_phone] %>
-  <p>
-    <%= form.label :alternative_phone, t(:alternative_phone) %><br/>
-    <%= form.text_field :alternative_phone %>
-  </p>
-<% end %>
+
 <% if billing %>
   <p class="field checkbox">
     <label for="wholesaler_use_billing">
diff --git a/app/views/wholesalers/_fields.html.erb b/app/views/wholesalers/_fields.html.erb
index ea12581..f31d009 100644
--- a/app/views/wholesalers/_fields.html.erb
+++ b/app/views/wholesalers/_fields.html.erb
@@ -78,12 +78,20 @@
 
 <br class="clear"/>
 
-<script type="text/javascript">
-//<![CDATA[
-
-	$('#wholesaler_use_billing').change(function(evt) {
-    $('#fields_ship_address').css('display', $(this).is(':checked') ? 'none' : 'block');
-  }).attr('checked', true).change(); 
-   
-//]]>
-</script>
\ No newline at end of file
+<% content_for :head do %>
+  <%= javascript_include_tag '/states', 'admin/wholesaler_address' %>
+  <script type="text/javascript">
+    //<![CDATA[
+    jQuery(document).ready(function(){
+      $('span#bcountry select').change(function() { update_wholesaler_state('b'); }).change();
+      $('span#scountry select').change(function() { update_wholesaler_state('s'); }).change();
+      <% if @wholesaler.new_record? || @bill_address == @ship_address %>
+        $('#wholesaler_use_billing').attr('checked', true).change();
+      <% end %>  
+    	$('#wholesaler_use_billing').change(function(evt) {
+        $('#fields_ship_address').toggle(!$(this).is(':checked'));
+      }).change(); 
+    });
+  //]]>
+  </script>  
+<% end %>
\ No newline at end of file
diff --git a/config/locales/en.yml b/config/locales/en.yml
index d605910..9faf067 100644
--- a/config/locales/en.yml
+++ b/config/locales/en.yml
@@ -1,5 +1,10 @@
 en:
 
+  successfully_created: %{resource} was successfully created.
+  successfully_updated: %{resource} was successfully updated.
+  successfully_removed: %{resource} was successfully removed.
+
+
   billing_firstname: "Billing First Name"
   billing_lastname: "Billing Last Name"
   shipping_firstname: "Shipping First Name"
@@ -27,8 +32,12 @@ en:
   wholesale_customer: "Wholesale Customer ID: #%{id}"
 
   
-  admin:
+  wholesaler:
+    parts_error_message: There are errors with the user or addresses
+  
   
+  admin:
+    
     hooks:
       product_form_right:
         master_wholesale_price: "Master Wholesale Price"
@@ -41,6 +50,10 @@ en:
     
     
     wholesalers:
+      
+      success: Wholesale account was successfully created
+      failed: Wholesale account could not be created
+    
       index:
         company: "Company"
         buyer_contact: "Buyer contact"
diff --git a/config/routes.rb b/config/routes.rb
index d3b9c6f..5c45f86 100644
--- a/config/routes.rb
+++ b/config/routes.rb
@@ -3,12 +3,16 @@
   resources :wholesalers
   
   namespace(:admin) do
+    
+    get '/wholesaler/states' => "wholesaler_states#index"
+  
     resources :wholesalers do
       member do
         get :approve
         get :reject
       end
     end
+    
   end
 
 end
diff --git a/lib/dummy_hooks/after_migrate.rb b/lib/dummy_hooks/after_migrate.rb
index 84c6c85..4a54835 100644
--- a/lib/dummy_hooks/after_migrate.rb
+++ b/lib/dummy_hooks/after_migrate.rb
@@ -1,2 +1,2 @@
 # assume wholesale prices
-rake "spree_wholesale:assume_wholesale_prices"
+rake "db:migrate db:seed db:sample spree_wholesale:assume_wholesale_prices", :env => "development"
diff --git a/lib/generators/base.rb b/lib/generators/base.rb
new file mode 100644
index 0000000..5721eee
--- /dev/null
+++ b/lib/generators/base.rb
@@ -0,0 +1,23 @@
+module SpreeWholesale
+  module Generators
+    class Base < Rails::Generators::Base
+    
+      include Rails::Generators::Migration      
+
+      def self.count!
+        @count ||= 0
+        (@count += 1) * 3
+      end
+
+      def self.next_migration_number(path)
+        @time ||= Time.new.utc
+        if ActiveRecord::Base.timestamped_migrations
+          (@time + self.count!).strftime("%Y%m%d%H%M%S")
+        else
+          "%.3d" % (current_migration_number(dirname) + 1)
+        end
+      end
+      
+    end
+  end
+end
diff --git a/lib/generators/spree_wholesale/install_generator.rb b/lib/generators/spree_wholesale/install_generator.rb
index 920ee27..2a99dad 100644
--- a/lib/generators/spree_wholesale/install_generator.rb
+++ b/lib/generators/spree_wholesale/install_generator.rb
@@ -1,24 +1,10 @@
+require 'generators/base'
+
 module SpreeWholesale
   module Generators
-    class InstallGenerator < Rails::Generators::Base
-      
-      include Rails::Generators::Migration      
-
-      def self.count!
-        @count ||= 0
-        (@count += 1) * 3
-      end
-
-      def self.next_migration_number(path)
-        @time ||= Time.new.utc
-        if ActiveRecord::Base.timestamped_migrations
-          (@time + self.count!).strftime("%Y%m%d%H%M%S")
-        else
-          "%.3d" % (current_migration_number(dirname) + 1)
-        end
-      end
+    class InstallGenerator < SpreeWholesale::Generators::Base
       
-      desc "Installs required migrations for spree_essentials"
+      desc "Installs required migrations for spree_wholesale"
       source_root File.expand_path("../../templates", __FILE__)
       
       def copy_migrations
diff --git a/lib/generators/spree_wholesale/upgrade_generator.rb b/lib/generators/spree_wholesale/upgrade_generator.rb
new file mode 100644
index 0000000..4af2254
--- /dev/null
+++ b/lib/generators/spree_wholesale/upgrade_generator.rb
@@ -0,0 +1,16 @@
+require 'generators/base'
+
+module SpreeWholesale
+  module Generators
+    class UpgradeGenerator < SpreeWholesale::Generators::Base
+      
+      desc "Upgrades an existing spree_wholesale installation"
+      source_root File.expand_path("../../templates", __FILE__)
+      
+      def copy_migrations
+        migration_template "db/migrate/upgrade_spree_wholesale.rb", "db/migrate/upgrade_spree_wholesale.rb"
+      end
+
+    end
+  end
+end
\ No newline at end of file
diff --git a/lib/generators/templates/db/migrate/install_spree_wholesale.rb b/lib/generators/templates/db/migrate/install_spree_wholesale.rb
index 61706f5..1838587 100644
--- a/lib/generators/templates/db/migrate/install_spree_wholesale.rb
+++ b/lib/generators/templates/db/migrate/install_spree_wholesale.rb
@@ -17,6 +17,7 @@ def self.up
       t.string :terms
       t.string :alternate_email
       t.text   :notes
+      t.timestamps
     end
   
     add_index :wholesalers, [:billing_address_id, :shipping_address_id]
diff --git a/lib/generators/templates/db/migrate/upgrade_spree_wholesale.rb b/lib/generators/templates/db/migrate/upgrade_spree_wholesale.rb
new file mode 100644
index 0000000..d1d8305
--- /dev/null
+++ b/lib/generators/templates/db/migrate/upgrade_spree_wholesale.rb
@@ -0,0 +1,19 @@
+class UpgradeSpreeWholesale < ActiveRecord::Migration
+  
+  def self.up
+    remove_column :wholesalers, :created_at
+    remove_column :wholesalers, :updated_at
+    add_column :wholesalers, :created_at, :datetime
+    add_column :wholesalers, :updated_at, :datetime
+    Wholesaler.all.each do |wholesaler|
+      wholesaler.created_at = wholesaler.user.created_at
+      wholesaler.save
+    end    
+  end
+
+  def self.down
+    remove_column :wholesalers, :created_at
+    remove_column :wholesalers, :updated_at
+  end
+
+end
\ No newline at end of file
diff --git a/lib/spree_wholesale.rb b/lib/spree_wholesale.rb
index a1163c7..0d93357 100644
--- a/lib/spree_wholesale.rb
+++ b/lib/spree_wholesale.rb
@@ -1,5 +1,6 @@
 require 'spree_core'
 require 'spree_auth'
+require 'spree_sample' unless Rails.env == 'production'
 
 require 'spree_wholesale/custom_hooks'
 require 'spree_wholesale/wholesaler_controller'
@@ -25,6 +26,9 @@ def self.activate
       Dir.glob(File.join(File.dirname(__FILE__), "../app/**/*_decorator.rb")) do |c|
         _load(c)
       end
+      
+      _load File.expand_path("../spree_wholesale/wholesaler_controller.rb", __FILE__)
+      
     end
 
     config.to_prepare &method(:activate).to_proc
diff --git a/lib/spree_wholesale/custom_hooks.rb b/lib/spree_wholesale/custom_hooks.rb
index 7af54d2..53d0a62 100644
--- a/lib/spree_wholesale/custom_hooks.rb
+++ b/lib/spree_wholesale/custom_hooks.rb
@@ -5,9 +5,9 @@ class CustomHooks < Spree::ThemeSupport::HookListener
     replace :cart_item_total,                 'hooks/cart_item_total'
     replace :admin_product_form_right,        'admin/hooks/product_form_right'
     
+    insert_before :account_my_orders,         'hooks/wholesale_customer'
     insert_before :inside_cart_form,          'hooks/wholesale_customer_id'
     insert_before :checkout_payment_step,     'hooks/wholesale_payment_options'
-    insert_before :account_my_orders,         'hooks/wholesale_customer_id'
     insert_after  :admin_order_show_buttons,  'hooks/wholesale_customer_id'
     
     
diff --git a/lib/spree_wholesale/wholesaler_controller.rb b/lib/spree_wholesale/wholesaler_controller.rb
index 02b4c16..9260959 100644
--- a/lib/spree_wholesale/wholesaler_controller.rb
+++ b/lib/spree_wholesale/wholesaler_controller.rb
@@ -5,7 +5,7 @@ module WholesalerController
     def self.included(mod)
       mod.instance_eval do
         resource_controller
-        before_filter :use_billing?, :only => [ :create, :update ] 
+        prepend_before_filter :use_billing?, :only => [:create, :update]
         before_filter :setup_defaults, :only => [:new,:create,:edit,:update]
         
         index.before :new_wholesale_user
@@ -45,78 +45,67 @@ def validate_wholesaler_parts
         uv = @user.valid?
         bv = @bill_address.valid?
         sv = @ship_address.valid?
-        valid = uv && bv && sv
-        if valid
-          @wholesaler.user = @user if @user.save
-          @wholesaler.bill_address = @bill_address if @bill_address.save
-          @wholesaler.ship_address = @ship_address if @ship_address.save
-        end
-        @wholesaler.valid? && valid
+        @wholesaler.user         = @user
+        @wholesaler.bill_address = @bill_address
+        @wholesaler.ship_address = @ship_address
+        uv && bv && sv        
+      end
+      
+      def new
+        @wholesaler ||= Wholesaler.new(params[:wholesaler])
       end
       
       def create
-        if validate_wholesaler_parts && @wholesaler.valid? && @wholesaler.save
-          return after_wholesaler_create
+        if validate_wholesaler_parts && @wholesaler.save
+          after_wholesaler_create
         else
-          return after_wholesaler_failed_create
+          after_wholesaler_failed_create
         end
       end
       
       def update
+        @bill_address.update_attributes(params[:bill_address])
+        if use_billing?
+          @wholesaler.ship_address.destroy unless @wholesaler.ship_address.nil? || @bill_address != @wholesaler.ship_address
+          @ship_address = @bill_address
+        else
+          @ship_address = @wholesaler.build_ship_address if @ship_address.nil? || @bill_address == @wholesaler.ship_address
+          @ship_address.update_attributes(params[:ship_address])
+        end
         validate_wholesaler_parts
-        @wholesaler.save
+        @wholesaler.touch && @wholesaler.save
         super
       end
-      
-      
-      
+            
       def use_billing?
         @use_billing ||= params[:wholesaler].delete(:use_billing).to_i == 1
       end
       
       def setup_defaults
-        
         params[:wholesaler] ||= {}
-        
         if request.get? && params[:dev]
           params[:wholesaler] = {"company"=>"Test Company", "buyer_contact"=>"Mr Contacter", "manager_contact"=>"Mr Manager", "phone"=>"555-555-5555", "fax"=>"555-555-5555 ext 1", "resale_number"=>"13414214", "taxid"=>"555-55-5555", "web_address"=>"testcompany.com", "terms"=>"Credit Card", "notes"=>""}
           params[:user] = {"email"=>"wholesale-#{rand(100)}@example.com", :password => "password" , :password_confirmation => "password" }
           params[:bill_address] = {"firstname"=>"Mister","lastname"=>"Accountant","address1"=>"123 Anystreet", "address2"=>"", "city"=>"Anytown", "state_id"=>"276110813", "zipcode"=>"98765", "country_id"=>"214", "phone"=>"555-555-5555"}
         end
-      
         @roles = Role.all
-      
         case params[:action]
           when 'new', 'create'
             @wholesaler = Wholesaler.new(params[:wholesaler])    
             @user = User.new(params[:user])
-            @bill_address = Address.new((params[:bill_address] || {}).merge(:country => default_country))  
-            
+            @bill_address = Address.new(params[:bill_address] || { :country_id => default_country })
             if use_billing?
               @ship_address = @bill_address
             else
-              @ship_address = Address.new((params[:ship_address] || {}).merge(:country => default_country))  
-            end      
-            
+              @ship_address = Address.new(params[:ship_address] || { :country_id => default_country })
+            end                    
           when 'edit', 'update', 'destroy'
-            @wholesaler = Wholesaler.find(params[:id])
-            @user = @wholesaler.user
+            @wholesaler   = Wholesaler.find(params[:id])
+            @user         = @wholesaler.user
             @bill_address = @wholesaler.bill_address
-            @ship_address = @wholesaler.ship_address
-        end
-            
-        if params[:action] == 'update'
-          if !use_billing? && @bill_address.id == @ship_address.id
-            @ship_address = Address.new((params[:ship_address] || {}).merge(:country => default_country))  
-          elsif use_billing? && @bill_address.id != @ship_address.id
-            @wholesaler.ship_address.destroy
-            @ship_address = @bill_address          
-          end
-        end
-        
-      end
-    
+            @ship_address = @wholesaler.ship_address                        
+        end                
+      end    
     end
-  
   end
-end
\ No newline at end of file
+end
diff --git a/public/javascripts/admin/wholesaler_address.js b/public/javascripts/admin/wholesaler_address.js
new file mode 100644
index 0000000..fb0af3f
--- /dev/null
+++ b/public/javascripts/admin/wholesaler_address.js
@@ -0,0 +1,22 @@
+$(document).ready(function() {
+  
+  $('.country-select').change(function(evt) {
+    var parent = $(this).parents('fieldset').find('p.state-select');
+    var span = parent.find('span.field');
+    var prefix = parent.attr('id').match(/bill/i) ? 'bill' : 'ship';
+    var current = span.find('.required');
+    
+    console.log(current);
+    
+    $.get('/admin/wholesaler/states', { country_id: this.options[this.selectedIndex].value }, function(res) {
+      res = res.replace(/"_address/g, '"' + prefix + '_address');
+      span.html(res);
+    });
+    
+  });
+    
+  $('#wholesaler_use_billing').change(function(evt) {
+    $('#fields_ship_address').toggle(!$(this).is(':checked'));
+  }).change();
+  
+});
diff --git a/public/stylesheets/admin/wholesalers.css b/public/stylesheets/admin/wholesalers.css
index 49ed287..50fe139 100644
--- a/public/stylesheets/admin/wholesalers.css
+++ b/public/stylesheets/admin/wholesalers.css
@@ -1,3 +1,10 @@
+.wholesaler-form input[type=text],
+.wholesaler-form select {
+  font-size: 1.1em;
+  font-weight: normal;
+  padding: 2px 3px;
+}
+
 input.required, select.required {
   color: #222;
 }
@@ -11,4 +18,5 @@ input.required, select.required {
 }
 .rightie {
   float: right;
-}
\ No newline at end of file
+}
+
diff --git a/spree_wholesale.gemspec b/spree_wholesale.gemspec
index 86f67dd..8380d6a 100644
--- a/spree_wholesale.gemspec
+++ b/spree_wholesale.gemspec
@@ -21,12 +21,15 @@ Gem::Specification.new do |s|
   s.add_dependency('spree_core', '>= 0.60.0')
   s.add_dependency('spree_auth', '>= 0.60.0')
   
-  s.add_development_dependency('spree_sample',   '>= 0.60.0')
-  s.add_development_dependency('shoulda',        '>= 2.11.3')
-	s.add_development_dependency('spork',          '>= 0.9.0.rc5')
-  s.add_development_dependency('spork-testunit', '>= 0.0.5')
-	s.add_development_dependency('sqlite3',        '>= 1.3.3')
-  s.add_development_dependency('faker',          '>= 0.9.5')
-  s.add_development_dependency('dummier',        '>= 0.1.0')
+  s.add_development_dependency('spree_sample',       '>= 0.60.0')
+  s.add_development_dependency('shoulda',            '>= 2.11.3')
+  s.add_development_dependency('factory_girl',       '>= 2.0.0.beta2')
+	s.add_development_dependency('capybara',           '>= 0.4.1')
+	s.add_development_dependency('selenium-webdriver', '>= 0.2.0')
+	s.add_development_dependency('spork',              '>= 0.9.0.rc5')
+  s.add_development_dependency('spork-testunit',     '>= 0.0.5')
+	s.add_development_dependency('sqlite3',            '>= 1.3.3')
+  s.add_development_dependency('faker',              '>= 0.9.5')
+  s.add_development_dependency('dummier',            '>= 0.1.0')
 
 end
diff --git a/test/fixtures/countries.yml b/test/fixtures/countries.yml
new file mode 100644
index 0000000..e532cad
--- /dev/null
+++ b/test/fixtures/countries.yml
@@ -0,0 +1,14 @@
+--- 
+countries_195: 
+  name: Switzerland
+  iso3: CHE
+  iso: CH
+  iso_name: SWITZERLAND
+  id: "195"
+countries_214: 
+  name: United States
+  iso3: USA
+  iso: US
+  iso_name: UNITED STATES
+  id: "214"
+  numcode: "840"
diff --git a/test/fixtures/orders.yml b/test/fixtures/orders.yml
index b9b4ddd..12750d9 100644
--- a/test/fixtures/orders.yml
+++ b/test/fixtures/orders.yml
@@ -44,7 +44,7 @@ complete:
   
 wholesale:
   id: 1069267041
-  user_id: 1057526560
+  user_id: 1
   number: R107687412
   item_total: 18.00
   total: 18.00
diff --git a/test/fixtures/states.yml b/test/fixtures/states.yml
new file mode 100644
index 0000000..02b838d
--- /dev/null
+++ b/test/fixtures/states.yml
@@ -0,0 +1,256 @@
+--- 
+states_043: 
+  name: Michigan
+  country_id: "214"
+  id: "931624400"
+  abbr: MI
+states_032: 
+  name: South Dakota
+  country_id: "214"
+  id: "615306087"
+  abbr: SD
+states_021: 
+  name: Washington
+  country_id: "214"
+  id: "414569975"
+  abbr: WA
+states_010: 
+  name: Wisconsin
+  country_id: "214"
+  id: "103680699"
+  abbr: WI
+states_044: 
+  name: Arizona
+  country_id: "214"
+  id: "948208802"
+  abbr: AZ
+states_033: 
+  name: Illinois
+  country_id: "214"
+  id: "625629523"
+  abbr: IL
+states_022: 
+  name: New Hampshire
+  country_id: "214"
+  id: "426832442"
+  abbr: NH
+states_011: 
+  name: North Carolina
+  country_id: "214"
+  id: "177087202"
+  abbr: NC
+states_045: 
+  name: Kansas
+  country_id: "214"
+  id: "969722173"
+  abbr: KS
+states_034: 
+  name: Missouri
+  country_id: "214"
+  id: "653576146"
+  abbr: MO
+states_023: 
+  name: Arkansas
+  country_id: "214"
+  id: "471470972"
+  abbr: AR
+states_012: 
+  name: Nevada
+  country_id: "214"
+  id: "179539703"
+  abbr: NV
+states_001: 
+  name: District of Columbia
+  country_id: "214"
+  id: "6764998"
+  abbr: DC
+states_046: 
+  name: Idaho
+  country_id: "214"
+  id: "982433740"
+  abbr: ID
+states_035: 
+  name: Nebraska
+  country_id: "214"
+  id: "673350891"
+  abbr: NE
+states_024: 
+  name: Pennsylvania
+  country_id: "214"
+  id: "471711976"
+  abbr: PA
+states_013: 
+  name: Hawaii
+  country_id: "214"
+  id: "199950338"
+  abbr: HI
+states_002: 
+  name: Utah
+  country_id: "214"
+  id: "17199670"
+  abbr: UT
+states_047: 
+  name: Vermont
+  country_id: "214"
+  id: "989115415"
+  abbr: VT
+states_036: 
+  name: Delaware
+  country_id: "214"
+  id: "721598219"
+  abbr: DE
+states_025: 
+  name: Rhode Island
+  country_id: "214"
+  id: "474001862"
+  abbr: RI
+states_014: 
+  name: Oklahoma
+  country_id: "214"
+  id: "248548169"
+  abbr: OK
+states_003: 
+  name: Louisiana
+  country_id: "214"
+  id: "37199952"
+  abbr: LA
+states_048: 
+  name: Montana
+  country_id: "214"
+  id: "999156632"
+  abbr: MT
+states_037: 
+  name: Tennessee
+  country_id: "214"
+  id: "726305632"
+  abbr: TN
+states_026: 
+  name: Maryland
+  country_id: "214"
+  id: "480368357"
+  abbr: MD
+states_015: 
+  name: Florida
+  country_id: "214"
+  id: "267271847"
+  abbr: FL
+states_004: 
+  name: Virginia
+  country_id: "214"
+  id: "41111624"
+  abbr: VA
+states_049: 
+  name: Minnesota
+  country_id: "214"
+  id: "1032288924"
+  abbr: MN
+states_038: 
+  name: New Jersey
+  country_id: "214"
+  id: "750950030"
+  abbr: NJ
+states_027: 
+  name: Ohio
+  country_id: "214"
+  id: "485193526"
+  abbr: OH
+states_016: 
+  name: California
+  country_id: "214"
+  id: "276110813"
+  abbr: CA
+states_005: 
+  name: North Dakota
+  country_id: "214"
+  id: "51943165"
+  abbr: ND
+states_050: 
+  name: Maine
+  country_id: "214"
+  id: "1055056709"
+  abbr: ME
+states_039: 
+  name: Indiana
+  country_id: "214"
+  id: "769938586"
+  abbr: IN
+states_028: 
+  name: Texas
+  country_id: "214"
+  id: "525212995"
+  abbr: TX
+states_017: 
+  name: Oregon
+  country_id: "214"
+  id: "298914262"
+  abbr: OR
+states_006: 
+  name: Wyoming
+  country_id: "214"
+  id: "66390489"
+  abbr: WY
+states_051: 
+  name: Alabama
+  country_id: "214"
+  id: "1061493585"
+  abbr: AL
+states_040: 
+  name: Iowa
+  country_id: "214"
+  id: "825306985"
+  abbr: IA
+states_029: 
+  name: Mississippi
+  country_id: "214"
+  id: "532363768"
+  abbr: MS
+states_018: 
+  name: Kentucky
+  country_id: "214"
+  id: "308473843"
+  abbr: KY
+states_007: 
+  name: New Mexico
+  country_id: "214"
+  id: "69729944"
+  abbr: NM
+states_041: 
+  name: Georgia
+  country_id: "214"
+  id: "876916760"
+  abbr: GA
+states_030: 
+  name: Colorado
+  country_id: "214"
+  id: "536031023"
+  abbr: CO
+states_019: 
+  name: Massachusetts
+  country_id: "214"
+  id: "385551075"
+  abbr: MA
+states_008: 
+  name: Connecticut
+  country_id: "214"
+  id: "69870734"
+  abbr: CT
+states_042: 
+  name: New York
+  country_id: "214"
+  id: "889445952"
+  abbr: NY
+states_031: 
+  name: South Carolina
+  country_id: "214"
+  id: "597434151"
+  abbr: SC
+states_020: 
+  name: Alaska
+  country_id: "214"
+  id: "403740659"
+  abbr: AK
+states_009: 
+  name: West Virginia
+  country_id: "214"
+  id: "91367981"
+  abbr: WV
diff --git a/test/functional/orders_controller_test.rb b/test/functional/orders_controller_test.rb
index 9a3ddab..cc013fb 100644
--- a/test/functional/orders_controller_test.rb
+++ b/test/functional/orders_controller_test.rb
@@ -1,21 +1,22 @@
-require 'test_helper'
+require_relative '../test_helper'
 
 class OrdersControllerTest < ActionController::TestCase
   
   should "get show" do
-    user = wholesale_user
-    sign_in(user)
+    @order = Factory.create(:wholesale_order)
+    @user = @order.user
+    @wholesaler = @user.wholesaler
     
-    order = orders(:wholesale)
-    order.user_id = user.id
-    order.save
+    assert @user.wholesaler?
     
-    assert user.orders.include?(order), "Wholesale order belongs to our signed in user"
+    sign_in(@user)
     
-    get :show, { :id => order.number }
+    assert @user.orders.include?(@order), "Wholesale order belongs to our signed in user"
+    
+    get :show, { :id => @order.number }
     
     assert_response :success
-    assert_tag :tag => "h4", :content => "Wholesale Customer ID: ##{user.id}", :attributes => { :class => "wholesale-customer-id" }
+    assert_tag :tag => "h4", :content => "Wholesale Customer ID: ##{@user.id}", :attributes => { :class => "wholesale-customer-id" }
     assert_not_nil assigns(:order), "Order is assigned to @order"
   end
   
diff --git a/test/functional/wholesalers_controller_test.rb b/test/functional/wholesalers_controller_test.rb
index 58102fc..257f93f 100644
--- a/test/functional/wholesalers_controller_test.rb
+++ b/test/functional/wholesalers_controller_test.rb
@@ -1,4 +1,4 @@
-require 'test_helper'
+require_relative '../test_helper'
 
 class WholesalersControllerTest < ActionController::TestCase
   
diff --git a/test/integration/admin_wholesalers_test.rb b/test/integration/admin_wholesalers_test.rb
new file mode 100644
index 0000000..84028bf
--- /dev/null
+++ b/test/integration/admin_wholesalers_test.rb
@@ -0,0 +1,133 @@
+require_relative '../test_helper'
+
+class AdminWholesalersTest < ActiveSupport::IntegrationCase
+  
+  def setup
+    Factory.create(:state)
+    @user = Factory.create(:admin_user)
+    login_as @user
+    
+    @labels = %(Company, Buyer contact, Manager contact, Phone, Fax, Resale number, Taxid, Web address, Notes).split(', ')
+    @values = %(Some Company, Buyer contact, Manager contact, 555-555-5555, 555-555-5555 ext 1, 12345, 123-45-6789, example.com, Yippee!).split(', ')
+    @address_labels = %(Billing First Name, Billing Last Name, Street Address, City, Zip, Phone).split(', ')
+    @address_values = %(Billy, Billerton, 111 State St, Santa Barbara, 93101, 555-555-5555).split(', ')
+  end
+  
+  should "have a link to new wholesaler" do
+    visit admin_wholesalers_path
+    btn = find(".actions a.button").native
+    assert_match /#{new_admin_wholesaler_path}$/, btn.attribute('href')
+    assert_equal "New Wholesaler", btn.text
+  end
+  #
+  #should "get new wholesaler" do
+  #  visit new_admin_wholesaler_path
+  #  assert has_content?("New Wholesaler")
+  #  within "#new_wholesaler" do
+  #    @labels.each do |f|
+  #      assert has_field?(f)
+  #    end
+  #    assert has_field?('Terms')
+  #  end
+  #end
+  #  
+  #should "validate wholesaler and parts" do
+  #  visit new_admin_wholesaler_path
+  #  click_button "Create"
+  #  assert_flash(:error, I18n.t('admin.wholesalers.failed'))
+  #  assert_seen I18n.t("wholesaler.parts_error_message"), :within => ".errorExplanation:first"
+  #end
+  #
+  #should "be a valid wholesaler but invalid parts" do
+  #  visit new_admin_wholesaler_path       
+  #  @labels.each_with_index do |label, index|
+  #  	fill_in label, :with => @values[index]      
+  #  end
+  #  select 'Credit Card', :from => 'Terms'
+  #  click_button "Create"
+  #  assert_flash(:error, I18n.t('admin.wholesalers.failed'))
+  #  assert_seen I18n.t("wholesaler.parts_error_message"), :within => ".errorExplanation:first"
+  #end
+  #
+  #should "create wholesaler and parts" do
+  #  visit new_admin_wholesaler_path       
+  #  
+  #  within ".wholesaler-details" do
+  #    @labels.each_with_index do |label, index|
+  #    	fill_in label, :with => @values[index]      
+  #    end
+  #    select 'Credit Card', :from => 'Terms'
+  #  end
+  #
+  #  within ".user-details" do
+  #    fill_in "Email", :with => random_email
+  #    fill_in "Password", :with => "password"
+  #    fill_in "Password Confirmation", :with => "password"
+  #  end
+  #
+  #  within ".billing-details" do
+  #    @address_labels.each_with_index do |label, index|
+  #      fill_in label, :with => @address_values[index]
+  #    end
+  #    select 'California', :from => 'State'
+  #    select 'United States', :from => 'Country'
+  #    check "Use billing address for shipping"
+  #  end
+  #  
+  #  
+  #  click_button "Create"
+  #  assert_flash(:notice, I18n.t('admin.wholesalers.success'))    
+  #end
+  #
+  
+  context "an existing wholesaler" do
+    
+    setup do
+      @wholesaler = Factory.create(:wholesaler)
+    end
+    
+    should "update wholesaler, user and addresses" do
+      visit edit_admin_wholesaler_path(@wholesaler)
+      
+      within ".wholesaler-details" do
+        @labels.each_with_index do |label, index|
+        	fill_in label, :with => @values[index].reverse      
+        end
+        select 'Credit Card', :from => 'Terms'
+      end
+      
+      #within ".user-details" do
+      #  fill_in "Email", :with => random_email
+      #  fill_in "Password", :with => "password"
+      #  fill_in "Password Confirmation", :with => "password"
+      #end
+      
+      within ".billing-details" do
+        @address_labels.each_with_index do |label, index|
+          fill_in label, :with => @address_values[index].reverse
+        end
+        select 'California', :from => 'State'
+        select 'United States', :from => 'Country'
+        uncheck "Use billing address for shipping"
+      end
+      
+      within ".shipping-details" do
+        @address_labels.each_with_index do |label, index|
+          fill_in label.sub('Billing', 'Shipping'), :with => @address_values[index]
+        end
+        select 'California', :from => 'State'
+        select 'United States', :from => 'Country'
+      end
+      
+      click_button "Update"
+      
+      sleep 10
+      assert_flash(:notice, I18n.t('successfully_updated', :resource => @wholesaler))
+      
+      assert_seen "Billy Billerton".reverse, :within => ".rightie .adr:first"
+      
+    end
+        
+  end
+  
+end
\ No newline at end of file
diff --git a/test/support/fixtures.rb b/test/support/fixtures.rb
new file mode 100644
index 0000000..944ef58
--- /dev/null
+++ b/test/support/fixtures.rb
@@ -0,0 +1,83 @@
+begin
+  
+  FactoryGirl.define do
+    
+    factory :state do
+      name "California"
+      abbr "CA"
+      country { Country.find_by_iso("US") || Factory.create(:country) }
+    end
+    
+    factory :country do
+      name "United States"
+      iso3 "USA"
+      iso "US"
+      iso_name { name.upcase }
+      numcode 840
+    end
+
+    factory :address do
+      firstname "Addy"
+      lastname "Streetston"
+      address1 { "#{100 + rand(1000)} State St" }
+      city "Santa Barbara"
+      phone "555-555-5555"
+      zipcode "93101"
+      state { State.find_by_name("California") || Factory.create(:state) }
+      country { Country.find_by_name("United States") || Factory.create(:country) }
+    end
+    
+    
+    factory :wholesaler do
+      company "Test Company"
+      buyer_contact "Mr Contacter"
+      manager_contact "Mr Manager"
+      phone "555-555-5555"
+      fax "555-555-5555 ext 1"
+      resale_number "123456789"
+      taxid "555-55-5555"
+      web_address "testcompany.com"
+      terms "Credit Card"
+      notes "What a guy!"
+      user { User.last || Factory.create(:user) }
+      bill_address { Factory.create(:address) }
+      ship_address { Factory.create(:address) }
+    end
+  
+    
+    factory :user do
+      email { random_email }
+      password "spree123"
+      password_confirmation "spree123"
+      roles { [Role.find_or_create_by_name("user")] }
+    end
+    
+    factory :admin_user, :parent => :user do
+      roles { [Role.find_or_create_by_name("admin")] }
+    end
+    
+    factory :wholesale_user, :parent => :user do
+      roles { [Role.find_or_create_by_name("wholesaler")] }
+      wholesaler { Factory.create(:wholesaler) }
+    end
+    
+    factory :order do
+      user { User.last || Factory.create(:user) }
+      state 'cart'
+      payment_state 'balance_due'
+      email { random_email }
+      wholesale false
+    end
+    
+    factory :wholesale_order, :parent => :order do
+      user { Factory.create(:wholesale_user) }
+      wholesale true
+    end
+  
+  end
+  
+rescue FactoryGirl::DuplicateDefinitionError
+  
+  puts "factories are already defined..."
+  
+end
\ No newline at end of file
diff --git a/test/support/helper_methods.rb b/test/support/helper_methods.rb
index de0b5ad..692d264 100644
--- a/test/support/helper_methods.rb
+++ b/test/support/helper_methods.rb
@@ -1,39 +1,49 @@
 module HelperMethods 
 
-  PRICE = BigDecimal.new("19.99")
-  WHOLESALE = BigDecimal.new("18.00")
-
-  EMAIL = "spree@example.com"
-  PASSWORD = "spree123"
-
-  def fullsale_user
-    return @wholesale_user if @wholesale_user
-    email = "fullsale@example.com"
-    @fullsale_user = User.create(:email => email, 
-      :password => PASSWORD,
-      :password_confirmation => PASSWORD,
-      :email => email,
-      :login => email
-    )
-    @fullsale_user.roles << roles(:user)
-    @fullsale_user
+  def random_email
+    random_token.split("").insert(random_token.length / 2, "@").push(".com").join("")
   end
   
-  def wholesale_user
-    return @wholesale_user if @wholesale_user
-    @wholesale_user = User.find_by_email("spree@example.com") rescue nil
-    unless @wholesale_user
-      @wholesale_user = User.new(
-        :password => PASSWORD,
-        :password_confirmation => PASSWORD,
-        :email => EMAIL,
-        :login => EMAIL
-      )
-      @wholesale_user.roles << roles(:user) unless @wholesale_user.has_role?("user")
-      @wholesale_user.roles << roles(:wholesaler) unless @wholesale_user.has_role?("wholesaler")
-      @wholesale_user.save
-    end
-    @wholesale_user
+  def random_token
+    Digest::SHA1.hexdigest((Time.now.to_i * rand).to_s)
   end
   
-end
\ No newline at end of file
+end
+
+#  PRICE = BigDecimal.new("19.99")
+#  WHOLESALE = BigDecimal.new("18.00")
+#
+#  EMAIL = "spree@example.com"
+#  PASSWORD = "spree123"
+#
+#  def fullsale_user
+#    return @wholesale_user if @wholesale_user
+#    email = "fullsale@example.com"
+#    @fullsale_user = User.create(:email => email, 
+#      :password => PASSWORD,
+#      :password_confirmation => PASSWORD,
+#      :email => email,
+#      :login => email
+#    )
+#    @fullsale_user.roles << roles(:user)
+#    @fullsale_user
+#  end
+#  
+#  def wholesale_user
+#    return @wholesale_user if @wholesale_user
+#    @wholesale_user = User.find_by_email("spree@example.com") rescue nil
+#    unless @wholesale_user
+#      @wholesale_user = User.new(
+#        :password => PASSWORD,
+#        :password_confirmation => PASSWORD,
+#        :email => EMAIL,
+#        :login => EMAIL
+#      )
+#      @wholesale_user.roles << roles(:user) unless @wholesale_user.has_role?("user")
+#      @wholesale_user.roles << roles(:wholesaler) unless @wholesale_user.has_role?("wholesaler")
+#      @wholesale_user.save
+#    end
+#    @wholesale_user
+#  end
+#  
+#end
\ No newline at end of file
diff --git a/test/support/integration_case.rb b/test/support/integration_case.rb
index 391724b..79f11d5 100644
--- a/test/support/integration_case.rb
+++ b/test/support/integration_case.rb
@@ -1,5 +1,28 @@
 # Define a bare test case to use with Capybara
+
 class ActiveSupport::IntegrationCase < ActiveSupport::TestCase
-  #include Capybara
+
+  include Capybara
   include Rails.application.routes.url_helpers
-end
\ No newline at end of file
+  include Warden::Test::Helpers    
+
+  self.use_transactional_fixtures = false
+  self.fixture_path = File.expand_path('../../fixtures', __FILE__)
+
+  def assert_seen(text, opts={})
+    if opts[:within]
+      within(opts[:within]) do
+        assert has_content?(text)
+      end
+    else
+      assert has_content?(text)
+    end
+  end
+  
+  def assert_flash(key, text)
+    within(".flash.#{key}") do
+      assert_seen(text)
+    end
+  end
+
+end
diff --git a/test/test_helper.rb b/test/test_helper.rb
index 386d242..5d61d0e 100644
--- a/test/test_helper.rb
+++ b/test/test_helper.rb
@@ -1,69 +1,55 @@
-
-
 # Configure Rails Envinronment
 ENV["RAILS_ENV"] = "test"
-
-env = File.expand_path("../dummy/config/environment.rb",  __FILE__)
-if File.exists?(env)
-  require env
-else
-  raise LoadError, "Please create the dummy app before running tests."
-end
-
-require 'rails/test_help'
-require 'shoulda'
 require 'spork'
 
-
-
-
 Spork.prefork do
-  # Loading more in this block will cause your tests to run faster. However,
-  # if you change any configuration or code from libraries loaded here, you'll
-  # need to restart spork for it take effect.
-
-end
-
-Spork.each_run do
-  # This code will be run each time you run your specs.
-
-end
-
 
-
-
-ActionMailer::Base.delivery_method    = :test
-ActionMailer::Base.perform_deliveries = true
-ActionMailer::Base.default_url_options[:host] = "test.com"
-
-Rails.backtrace_cleaner.remove_silencers!
-
-# Configure capybara for integration testing
-#require "capybara/rails"
-#Capybara.default_driver   = :rack_test
-#Capybara.default_selector = :css
-
-# Run any available migration
-ActiveRecord::Migrator.migrate File.expand_path("../dummy/db/migrate/", __FILE__)
-
-# Load support files
-Dir["#{File.dirname(__FILE__)}/support/**/*.rb"].each { |f| require f }
-
-include HelperMethods
-
-
-if 40 <= Spree.version.split(".")[1].to_i
+  env = File.expand_path("../dummy/config/environment.rb",  __FILE__)
+  if File.exists?(env)
+    require env
+  else
+    raise LoadError, "Please create the dummy app before running tests. Try running `bundle exec dummier`"
+  end
+  
+  require 'rails/test_help'
+  require 'shoulda'
+  require 'factory_girl'
+  require 'capybara/rails'
+  
+
+  ActionMailer::Base.delivery_method    = :test
+  ActionMailer::Base.perform_deliveries = true
+  ActionMailer::Base.default_url_options[:host] = "example.com"
+
+  Rails.backtrace_cleaner.remove_silencers!
+
+  # Configure capybara for integration testing
+  Capybara.default_driver   = :selenium
+  Capybara.default_selector = :css
+  
+  # Run any available migration
+  ActiveRecord::Migrator.migrate File.expand_path("../dummy/db/migrate/", __FILE__)
+  
   class ActionController::TestCase
     include Devise::TestHelpers
   end
-end
-
+    
+  class ActiveSupport::TestCase
+    self.fixture_path = File.expand_path('../fixtures', __FILE__)
+    fixtures :all
+  end
+  
+  class ActionController::IntegrationTest
+    self.fixture_path = File.expand_path('../fixtures', __FILE__)
+  end
 
-class ActiveSupport::TestCase
-  self.fixture_path = File.expand_path('../fixtures', __FILE__)
-  fixtures :all
 end
 
-class ActionController::IntegrationTest
-  self.fixture_path = File.expand_path('../fixtures', __FILE__)
+Spork.each_run do
+  
+  # Load support files
+  Dir["#{File.dirname(__FILE__)}/support/**/*.rb"].each { |f| require f }
+  
+  include HelperMethods
+  
 end
diff --git a/test/unit/order_test.rb b/test/unit/order_test.rb
index ad070e8..0a2db91 100644
--- a/test/unit/order_test.rb
+++ b/test/unit/order_test.rb
@@ -1,43 +1,46 @@
-require 'test_helper'
+require_relative '../test_helper'
 
 class OrderTest < ActiveSupport::TestCase
 
+  PRICE = BigDecimal.new("19.99")
+  WHOLESALE = BigDecimal.new("18.00")
+
   fixtures :orders, :products
   
   should "respond to wholesale" do
     order = Order.new
-    assert order.respond_to?(:wholesale), "Order is not wholesale ready. Try running `rake db:migrate` first."
+    assert order.respond_to?(:wholesale)
   end
   
   should "be wholesale" do
-    order = orders(:wholesale)
+    order = Factory.create(:wholesale_order)
     assert order.is_wholesale?
   end
   
   should "convert to wholesale" do
-    order = orders(:incomplete)
+    order = Factory.create(:order, :user => Factory.create(:user))
     assert !order.is_wholesale?
-    order.to_wholesale!    
-    assert order.is_wholesale?
+    assert !order.to_wholesale!
+    assert !order.is_wholesale?    
+    order.user.wholesaler = Factory.create(:wholesaler)
+    assert order.to_wholesale!
+    assert order.is_wholesale?    
   end
   
-  should "get wholesale price" do
-    order = orders(:incomplete)
-    order.line_items = []
-    order.wholesale = true
-    order.save
+  should "get regular price" do
+    order = Factory.create(:order)
+    assert_equal 0, order.item_total
     order.add_variant(products(:wholesale).master)
     order.update!
-    assert_equal WHOLESALE, order.item_total
+    assert_equal PRICE, order.item_total
   end
   
-  should "get regular price" do
-    order = orders(:incomplete)
-    order.line_items = []
-    order.save
+  should "get wholesale price" do
+    order = Factory.create(:wholesale_order)
+    assert_equal 0, order.item_total
     order.add_variant(products(:wholesale).master)
     order.update!
-    assert_equal PRICE, order.item_total
+    assert_equal WHOLESALE, order.item_total
   end
   
 end
diff --git a/test/unit/product_test.rb b/test/unit/product_test.rb
index fa61daf..37e9138 100644
--- a/test/unit/product_test.rb
+++ b/test/unit/product_test.rb
@@ -1,4 +1,4 @@
-require 'test_helper'
+require_relative '../test_helper'
 
 class ProductTest < ActiveSupport::TestCase
 
diff --git a/test/unit/roles_test.rb b/test/unit/roles_test.rb
index b1c2bf7..2d3d9d5 100644
--- a/test/unit/roles_test.rb
+++ b/test/unit/roles_test.rb
@@ -1,4 +1,4 @@
-require 'test_helper'
+require_relative '../test_helper'
 
 class RolesTest < ActiveSupport::TestCase
     
diff --git a/test/unit/wholesaler_test.rb b/test/unit/wholesaler_test.rb
index 3341ec1..f3db174 100644
--- a/test/unit/wholesaler_test.rb
+++ b/test/unit/wholesaler_test.rb
@@ -1,8 +1,10 @@
-require 'test_helper'
+require_relative '../test_helper'
 
 class WholesalerTest < ActiveSupport::TestCase
   
-  fixtures :all
+  def setup
+    # nada
+  end
   
   should belong_to(:user)
   should belong_to(:bill_address)
@@ -14,36 +16,52 @@ class WholesalerTest < ActiveSupport::TestCase
   should validate_presence_of(:phone)
   should validate_presence_of(:taxid)
   
-  def build_wholesaler(complete=false)
-    @wholesaler ||= wholesalers(:new_wholesaler)
-    return @wholesaler unless complete
-    @wholesaler = add_parts(@wholesaler)
-    @wholesaler.save
-    @wholesaler
-  end
+  context "with a new wholesaler" do
   
-  def add_parts(wholesaler=@wholesaler)
-    wholesaler.user = fullsale_user
-    wholesaler.bill_address = addresses(:billing)
-    wholesaler.ship_address = addresses(:shipping)
-    wholesaler
+    setup do
+      @wholesaler = Factory.build(:wholesaler, :user => nil, :ship_address => nil, :bill_address => nil)
+    end
+    
+    should "create valid wholesaler" do
+      assert !@wholesaler.valid?
+      @wholesaler.user = Factory.create(:wholesale_user)
+      @wholesaler.bill_address = @wholesaler.ship_address = Factory.create(:address)
+      assert @wholesaler.valid?
+      assert @wholesaler.save   
+    end
+    
   end
   
-  should "create valid wholesaler" do
-    build_wholesaler
-    assert !@wholesaler.valid?
-    add_parts
-    assert @wholesaler.valid?
-    assert @wholesaler.save    
-  end
-      
-  should "activate and deactivate" do
-    build_wholesaler(true)
-    assert !@wholesaler.active?
-    @wholesaler.activate!
-    assert @wholesaler.active?
-    @wholesaler.deactivate!
-    assert !@wholesaler.active?
+  context "with an existing wholesaler" do
+  
+    setup do    
+      @wholesaler = Factory.create(:wholesaler, 
+        :user         => Factory.create(:wholesale_user),
+        :bill_address => Factory.create(:address),
+        :ship_address => Factory.create(:address)
+      )
+    end
+    
+    should "activate" do 
+      assert !@wholesaler.active?
+      @wholesaler.activate!
+      assert @wholesaler.active?
+    end
+    
+    should "deactivate" do 
+      @wholesaler.activate!
+      assert @wholesaler.active?
+      @wholesaler.deactivate!
+      assert !@wholesaler.active?
+    end
+    
   end
   
+    
+  #should "activate and deactivate" do
+  #  
+  #  @wholesaler.deactivate!
+  #  assert !@wholesaler.active?
+  #end
+  
 end
\ No newline at end of file