From e0d03fa305170dbe7cc26119f0194f5c15d78fcb Mon Sep 17 00:00:00 2001
From: Rob H <oeoeaio@gmail.com>
Date: Fri, 17 Jan 2014 15:29:08 +0800
Subject: [PATCH] Listing more attributes of orders on BOM page

---
 .../admin/orders/bulk_management.html.haml    |  6 ++-
 .../admin/bulk_order_management_spec.rb       | 37 ++++++++++++++-----
 2 files changed, 32 insertions(+), 11 deletions(-)

diff --git a/app/views/spree/admin/orders/bulk_management.html.haml b/app/views/spree/admin/orders/bulk_management.html.haml
index 0031cbffe9..2552f305f8 100644
--- a/app/views/spree/admin/orders/bulk_management.html.haml
+++ b/app/views/spree/admin/orders/bulk_management.html.haml
@@ -11,6 +11,10 @@
     %thead
       %tr
         %th ID
+        %th Email
+        %th Order Date
     %tbody{ 'ng-repeat' => 'order in orders', 'ng-class-even' => "'even'", 'ng-class-odd' => "'odd'" }
       %tr.order
-        %td.id {{ order.id }}
\ No newline at end of file
+        %td.id {{ order.id }}
+        %td.email {{ order.email }}
+        %td.date {{ order.completed_at }}
\ No newline at end of file
diff --git a/spec/features/admin/bulk_order_management_spec.rb b/spec/features/admin/bulk_order_management_spec.rb
index 906b597b0a..9ad92c30ed 100644
--- a/spec/features/admin/bulk_order_management_spec.rb
+++ b/spec/features/admin/bulk_order_management_spec.rb
@@ -6,21 +6,21 @@ feature %q{
 } , js: true do
   include AuthenticationWorkflow
   include WebHelper
-  
+
   before :all do
     @default_wait_time = Capybara.default_wait_time
     Capybara.default_wait_time = 5
   end
-  
+
   after :all do
     Capybara.default_wait_time = @default_wait_time
   end
 
-  describe "listing orders" do
+  context "listing orders" do
     before :each do
       login_to_admin_section
     end
-    
+
     it "displays a Bulk Management Tab under the Orders item" do
       visit '/admin/orders'
 
@@ -29,14 +29,31 @@ feature %q{
       page.should have_selector "h1.page-title", text: "Bulk Order Management"
     end
 
-    it "displays a list of orders" do
-      o1 = FactoryGirl.create(:order, state: 'complete', completed_at: Time.now)
-      o2 = FactoryGirl.create(:order, state: 'complete', completed_at: Time.now)
+    context "displaying individual columns" do
+      let!(:o1) { FactoryGirl.create(:order, state: 'complete', completed_at: Time.now ) }
+      let!(:o2) { FactoryGirl.create(:order, state: 'complete', completed_at: Time.now ) }
 
-      visit '/admin/orders/bulk_management'
+      before :each do
+        visit '/admin/orders/bulk_management'
+      end
 
-      page.should have_selector "td", text: o1.id.to_s, :visible => true
-      page.should have_selector "td", text: o2.id.to_s, :visible => true
+      it "displays a list of orders" do
+        page.should have_selector "th", text: "ID", :visible => true
+        page.should have_selector "td", text: o1.id.to_s, :visible => true
+        page.should have_selector "td", text: o2.id.to_s, :visible => true
+      end
+
+      it "displays a column for user email" do
+        page.should have_selector "th", text: "EMAIL", :visible => true
+        page.should have_selector "td", text: o1.email, :visible => true
+        page.should have_selector "td", text: o2.email, :visible => true
+      end
+
+      it "displays a column for order date" do
+        page.should have_selector "th", text: "ORDER DATE", :visible => true
+        page.should have_selector "td", text: o1.completed_at.strftime("%F %T"), :visible => true
+        page.should have_selector "td", text: o2.completed_at.strftime("%F %T"), :visible => true
+      end
     end
   end
 end
\ No newline at end of file