Restructuring customer accounts spec

spec/features/consumer/account_spec.rb

@@ -7,57 +7,59 @@ feature %q{
 }, js: true do
   include UIComponentHelper
   include AuthenticationWorkflow
-  let!(:user) { create(:user)}
-  let!(:user2) {create(:user)}
+
+  let(:user) { create(:user)}
   let!(:distributor1) { create(:distributor_enterprise) }
   let!(:distributor2) { create(:distributor_enterprise) }
   let!(:distributor_credit) { create(:distributor_enterprise) }
   let!(:distributor_without_orders) { create(:distributor_enterprise) }
   let!(:accounts_distributor) {create :distributor_enterprise}
   let!(:order_account_invoice) { create(:order, distributor: accounts_distributor, state: 'complete', user: user) }
-  let!(:d1o1) { create(:completed_order_with_totals, distributor_id: distributor1.id, user_id: user.id, total: 10000)}
-  let!(:d1o2) { create(:order_without_full_payment, distributor_id: distributor1.id, user_id: user.id, total: 5000)}
-  let!(:d2o1) { create(:completed_order_with_totals, distributor_id: distributor2.id, user_id: user.id)}
-  let!(:credit_order) { create(:order_with_credit_payment, distributor_id: distributor_credit.id, user_id: user.id)}
-#  let!(:credit_payment) { create(:payment, amount: 12000.00, order_id: credit_order.id)}
 
-
-  before do
-    Spree::Config.accounts_distributor_id = accounts_distributor.id
-    credit_order.update!
-    login_as user
-    visit "/account"
-  end
-
-  it "shows all hubs that have been ordered from with balance or credit" do
-    # Single test to avoid re-rendering page
-    expect(page).to have_content distributor1.name
-    expect(page).to have_content distributor2.name
-    expect(page).not_to have_content distributor_without_orders.name
-    # Exclude the special Accounts & Billing distributor
-    expect(page).not_to have_content accounts_distributor.name
-    expect(page).to have_content distributor1.name + " " + "Balance due"
-    expect(page).to have_content distributor_credit.name + " Credit"
-  end
-
-
-  it "reveals table of orders for distributors when clicked" do
-    expand_active_table_node distributor1.name
-    expect(page).to have_link "Order " + d1o1.number, href:"/orders/#{d1o1.number}"
-
-    expand_active_table_node distributor2.name
-    expect(page).not_to have_content "Order " + d1o1.number.to_s
-  end
-
-  context "for a user without orders" do
+  context "as a logged in user" do
     before do
-      login_as user2
-      visit "/account"
+      Spree::Config.accounts_distributor_id = accounts_distributor.id
+      login_as user
     end
 
-    it "displays an appropriate message" do
-      expect(page).to have_content {t :you_have_no_orders_yet}
+    context "with completed orders" do
+      let!(:d1o1) { create(:completed_order_with_totals, distributor_id: distributor1.id, user_id: user.id, total: 10000)}
+      let!(:d1o2) { create(:order_without_full_payment, distributor_id: distributor1.id, user_id: user.id, total: 5000)}
+      let!(:d2o1) { create(:completed_order_with_totals, distributor_id: distributor2.id, user_id: user.id)}
+      let!(:credit_order) { create(:order_with_credit_payment, distributor_id: distributor_credit.id, user_id: user.id)}
+
+      before do
+        credit_order.update!
+      end
+
+      it "shows all hubs that have been ordered from with balance or credit" do
+        # Single test to avoid re-rendering page
+        visit "/account"
+
+        # It shows all hubs that have been ordered from with balance or credit
+        expect(page).to have_content distributor1.name
+        expect(page).to have_content distributor2.name
+        expect(page).not_to have_content distributor_without_orders.name
+
+        # Exclude the special Accounts & Billing distributor
+        expect(page).not_to have_content accounts_distributor.name
+        expect(page).to have_content distributor1.name + " " + "Balance due"
+        expect(page).to have_content distributor_credit.name + " Credit"
+
+        # It reveals table of orders for distributors when clicked
+        expand_active_table_node distributor1.name
+        expect(page).to have_link "Order " + d1o1.number, href:"/orders/#{d1o1.number}"
+
+        expand_active_table_node distributor2.name
+        expect(page).not_to have_content "Order " + d1o1.number.to_s
+      end
+    end
+
+    context "without any completed orders" do
+      it "displays an appropriate message" do
+        visit "/account"
+        expect(page).to have_content {t :you_have_no_orders_yet}
+      end
     end
   end
-
 end