misc tidying up

app/controllers/admin/orders_controller.rb

@@ -7,33 +7,25 @@ class Admin::OrdersController < ApplicationController
   end
 
   def search
+    authorize! :manage, :all
     @orders = nil
 
     if params[:search_text]
       case params[:search_by]
         when "member"
-          begin
-            @member = Member.find(params[:search_text])
+          @member = Member.find_by_id(params[:search_text])
+          if @member
             @orders = @member.orders
-          rescue ActiveRecord::RecordNotFound
-            flash[:alert] = "Couldn't find member with name #{params[:search_text]}"
           end
         when "order_id"
-          begin
-            @orders = [ Order.find(params[:search_text]) ]
-          rescue ActiveRecord::RecordNotFound
-            flash[:alert] = "Couldn't find order with id #{params[:search_text]}"
-          end
+          @orders = [ Order.find_by_id(params[:search_text]) ]
         when "paypal_token"
           @orders = [ Order.find_by_paypal_express_token(params[:search_text]) ]
-          if @orders.nil?
-            flash[:alert] = "Couldn't find order with paypal token #{params[:search_text]}"
-          end
         when "paypal_payer_id"
           @orders = [ Order.find_by_paypal_express_payer_id(params[:search_text]) ]
-          if @orders.nil?
-            flash[:alert] = "Couldn't find order with paypal payer id #{params[:search_text]}"
-          end
+      end
+      if @orders.nil?
+        flash[:alert] = "Couldn't find order with #{params[:search_by]} = #{params[:search_text]}"
       end
     end
 

spec/helpers/account_types_helper_spec.rb

@@ -1,15 +0,0 @@
-require 'spec_helper'
-
-# Specs in this file have access to a helper object that includes
-# the AccountTypesHelper. For example:
-#
-# describe AccountTypesHelper do
-#   describe "string concat" do
-#     it "concats two strings with spaces" do
-#       helper.concat_strings("this","that").should == "this that"
-#     end
-#   end
-# end
-describe AccountTypesHelper do
-  pending "add some examples to (or delete) #{__FILE__}"
-end

spec/helpers/admin/orders_helper_spec.rb

@@ -1,15 +0,0 @@
-require 'spec_helper'
-
-# Specs in this file have access to a helper object that includes
-# the Admin::OrdersHelper. For example:
-#
-# describe Admin::OrdersHelper do
-#   describe "string concat" do
-#     it "concats two strings with spaces" do
-#       helper.concat_strings("this","that").should == "this that"
-#     end
-#   end
-# end
-describe Admin::OrdersHelper do
-  pending "add some examples to (or delete) #{__FILE__}"
-end

spec/models/account_type_spec.rb

@@ -1,5 +1,4 @@
 require 'spec_helper'
 
 describe AccountType do
-  pending "add some examples to (or delete) #{__FILE__}"
 end

spec/views/admin/orders/index_spec.rb

@@ -0,0 +1,16 @@
+require 'spec_helper'
+
+describe 'admin/orders/index.html.haml', :type => "view" do
+  before(:each) do
+    @member = FactoryGirl.create(:admin_member)
+    sign_in @member
+    controller.stub(:current_user) { @member }
+    render
+  end
+
+  it "includes a search form for orders" do
+    assert_select "form"
+    assert_select "input#search_text"
+    assert_select "select#search_by"
+  end
+end