spec/datasets/forms.rb in radiant-shop-extension-0.10.0 vs spec/datasets/forms.rb in radiant-shop-extension-0.11.0

@@ -87,11 +87,11 @@
       })
       mock(Forms::Tags::Responses).current(anything,anything) { @response }
     end
     
     def mock_valid_form_checkout_request
-      @form   = forms(:checkout)
+      @form = forms(:checkout)
       @form[:extensions] = {
         :checkout   => {
           :test     => true,
           :gateway  => {
             :name   => 'Bogus'
@@ -110,10 +110,31 @@
           :verification => '123',
           :month        => 1,
           :year         => 2012,
           :type         => 'visa'
         },
+        :options => {
+          :address => {
+            :address1   => 'address',
+            :zip        => 'zip'
+          }
+        }
+      }
+      
+      @request.session = { :shop_order => @order.id }
+    end
+    
+    def mock_valid_form_address_request
+      @form = forms(:checkout)
+      @form[:extensions] = {
+        :address    => {
+          :billing  => true,
+          :shipping => true
+        }
+      }
+      
+      @data = {
         :billing => {
           :id           => shop_addresses(:billing).id,
           :name         => shop_addresses(:billing).name,
           :email        => shop_addresses(:billing).email,
           :street       => shop_addresses(:billing).street,
@@ -129,18 +150,12 @@
           :street       => shop_addresses(:shipping).street,
           :city         => shop_addresses(:shipping).city,
           :state        => shop_addresses(:shipping).state,
           :country      => shop_addresses(:shipping).country,
           :postcode     => shop_addresses(:shipping).postcode
-        },
-        :options => {
-          :address => {
-            :address1   => 'address',
-            :zip        => 'zip'
-          }
         }
       }
-      
+
       @request.session = { :shop_order => @order.id }
     end
   end
   
 end
\ No newline at end of file