Merge pull request #159 from 18F/85744742_empty_recent_purchases_message

85744742 empty recent purchases message

Author: phirefly

app/assets/stylesheets/common/communicarts.css.scss

@@ -116,7 +116,7 @@ body.communicart-notification {
   line-height: 20px;
 }
 
-body.communicart-notification p {
+body.communicart-notification p, p.empty-list-label {
   color: #333;
 }
 

app/controllers/carts_controller.rb

@@ -11,18 +11,20 @@ def show
   def index
     # TODO: handle role on a cart-by-cart basis
     # (including action buttons in approver/open case)
-    @role = 'requester'
-    my_carts = current_user.carts.where(approvals: {role: @role})
-    if my_carts.empty?
-      @role = 'approver'
-      my_carts = current_user.carts.where(approvals: {role: @role})
-    end
-    @closed_carts = my_carts.closed
-    @open_carts = my_carts.open
+    @role = requester_or_approver
+    @carts = current_user.carts.where(approvals: { role: @role })
   end
 
   def archive
     @role = params[:role] || 'requester'
     @closed_cart_full_list = current_user.carts.where(approvals: {role: @role}).closed
   end
+
+  private
+
+  def requester_or_approver
+    ['requester','approver'].each do |role|
+      break role if current_user.carts.where(approvals: { role: role }).any?
+    end
+  end
 end

app/views/carts/_archive_link.html.erb

@@ -0,0 +1,5 @@
+<div class="col-sm-2">
+  <%- if @carts.closed.size > CartsController::CLOSED_CART_LIMIT %>
+    <%= link_to "View the archive", url_for(:controller => 'carts', :action => 'archive', :role => @role) %>
+  <%- end %>
+</div>

app/views/carts/_cart_list.html.erb

@@ -12,7 +12,7 @@
   <%- if defined? limit %>
     <%- cart_list = carts.limit(limit) %>
   <%- else %>
-    <%-cart_list = carts %> 
+    <%-cart_list = carts %>
   <%- end %>
   <%- cart_list.each do |cart| %>
     <tr>

app/views/carts/index.html.erb

@@ -2,32 +2,34 @@
   <div class="row pending-pr">
     <div class="col-md-12">
       <h3>Pending Purchase Requests</h3>
-      <%= render partial: "cart_list", locals: { carts: @open_carts, role: @role, closed: false} %>
+      <%- if @carts.open.any? %>
+        <%= render partial: "cart_list", locals: { carts: @carts.open, role: @role, closed: false} %>
+      <%- else %>
+        <p class="empty-list-label">No pending purchase requests</p>
+      <%- end %>
     </div>
   </div>
   <div class="row past-pr">
     <div class="col-sm-10">
-      <h3>Recent Purchase Requests</h3>
-    </div>
-    <div class="col-sm-2">
-      <%- if @closed_carts.size > CartsController::CLOSED_CART_LIMIT %>
-        <%= link_to "View the archive", url_for(:controller => 'carts', :action => 'archive', :role => @role) %>
-      <%- end %>
-    </div>
-  </div>
-  <div class="row">
-    <div class="col-sm-12">
-      <%= render partial: "cart_list", locals: { carts: @closed_carts, role: @role, closed: true,
-                                                        limit: CartsController::CLOSED_CART_LIMIT} %>
+      <h3>Recently Closed Purchase Requests</h3>
     </div>
+
+    <%= render partial: 'archive_link' %>
+
   </div>
-  <div class="row">
-    <div class="col-sm-10">
+  <%- if @carts.closed.any? %>
+    <div class="row">
+      <div class="col-sm-12">
+        <%= render partial: "cart_list", locals: { carts: @carts.closed, role: @role, closed: true,
+                                                          limit: CartsController::CLOSED_CART_LIMIT} %>
+      </div>
     </div>
-    <div class="col-sm-2">
-      <%- if @closed_carts.size > CartsController::CLOSED_CART_LIMIT %>
-        <%= link_to "View the archive", url_for(:controller => 'carts', :action => 'archive', :role => @role) %>
-      <%- end %>
+
+    <div class="row">
+      <%= render partial: "archive_link" %>
     </div>
-  </div>
+
+  <%- else %>
+    <p class="empty-list-label">No recently closed purchase requests</p>
+  <%- end %>
 </div>

spec/controllers/carts_controller_spec.rb

@@ -1,52 +1,32 @@
 describe CartsController do
-  let(:user1) { FactoryGirl.create(:user) }
-  let(:user2) { FactoryGirl.create(:user) }
-  let(:user3) { FactoryGirl.create(:user) }
-  let(:user4) { FactoryGirl.create(:user) }
+  let(:user) { FactoryGirl.create(:user) }
   let(:approval_group1) { FactoryGirl.create(:approval_group, name: 'test-approval-group1') }
-  let(:approval_group2) { FactoryGirl.create(:approval_group, name: 'test-approval-group2') }
 
   before do
-    UserRole.create!(user_id: user1.id, approval_group_id: approval_group1.id, role: 'approver')
-    UserRole.create!(user_id: user2.id, approval_group_id: approval_group1.id, role: 'requester')
-    UserRole.create!(user_id: user3.id, approval_group_id: approval_group1.id, role: 'approver')
+    UserRole.create!(user_id: user.id, approval_group_id: approval_group1.id, role: 'requester')
     p = {'approvalGroup' => 'test-approval-group1', 'cartName' => 'cart1' }
     @cart1 = Commands::Approval::InitiateCartApproval.new.perform(p)
     session[:user] = {}
   end
 
-  describe('index') do
-
-    it 'should find the open cart' do
-      session[:user]['email'] = user2.email_address
-      get :index
-      expect(assigns(:open_carts).first).to eq(@cart1)
-    end
-
-    it 'should find nothing' do
-      session[:user]['email'] = user4.email_address
-      get :index
-      expect(assigns(:open_carts).first).to be_nil
-    end
-
-    it 'should find the approved cart' do
-      session[:user]['email'] = user2.email_address
-      @cart1.update_attributes(status: 'approved')
+  describe '#index' do
+    it 'sets @role' do
+      session[:user]['email'] = user.email_address
       get :index
-      expect(assigns(:closed_carts).first).to eq(@cart1)
+      expect(assigns(:role)).to eq 'requester'
     end
 
-    it 'should find the rejected cart' do
-      session[:user]['email'] = user2.email_address
-      @cart1.update_attributes(status: 'rejected')
+    it 'sets @carts' do
+      approval_group1
+      session[:user]['email'] = user.email_address
       get :index
-      expect(assigns(:closed_carts).first).to eq(@cart1)
+      expect(assigns(:carts)).to eq [@cart1]
     end
   end
 
-  describe('archive') do
+  describe '#archive' do
     it 'should show all the closed carts' do
-      session[:user]['email'] = user2.email_address
+      session[:user]['email'] = user.email_address
       carts = Array.new
       (1..4).each do |i|
         p = {}
@@ -60,4 +40,17 @@
       expect(assigns(:closed_cart_full_list).size).to eq(3)
     end
   end
+
+  describe '#requester_or_approver helper' do
+    it 'returns requester role set on approval' do
+      session[:user]['email'] = user.email_address
+      expect(controller.send(:requester_or_approver)).to eq 'requester'
+    end
+
+    it 'returns approver role set on approval' do
+      user.approvals.first.update_attributes(role: 'approver')
+      session[:user]['email'] = user.email_address
+      expect(controller.send(:requester_or_approver)).to eq 'approver'
+    end
+  end
 end

spec/models/cart_spec.rb

@@ -64,4 +64,39 @@
       expect(cart.ordered_awaiting_approvals).to eq(cart.awaiting_approvals.order('id DESC'))
     end
   end
+
+  context 'scopes' do
+    let(:approved_cart1) { FactoryGirl.create(:cart, status: 'approved') }
+    let(:approved_cart2) { FactoryGirl.create(:cart, status: 'approved') }
+    let(:pending_cart)  { FactoryGirl.create(:cart, status: 'pending') }
+    let(:rejected_cart)   { FactoryGirl.create(:cart, status: 'rejected') }
+
+    describe 'approved' do
+      it "returns approved carts" do
+        approved_cart1
+        approved_cart2
+        pending_cart
+        expect(Cart.approved).to eq [approved_cart1, approved_cart2]
+      end
+    end
+
+    describe 'open' do
+      it 'returns open carts' do
+        approved_cart1
+        pending_cart
+        expect(Cart.open).to eq [pending_cart]
+      end
+    end
+
+    describe 'closed' do
+      it 'returns closed carts' do
+        approved_cart1
+        pending_cart
+        rejected_cart
+        expect(Cart.closed).to eq [approved_cart1, rejected_cart]
+      end
+    end
+
+  end
+
 end