[#4554] Fix the markup calculation to work with plain numerics

test/unit/fixed_budget_test.rb

@@ -27,7 +27,43 @@ class FixedBudgetTest < ActiveSupport::TestCase
         @fixed_budget.markup = '$4,000.57'
         assert_equal 4000.57, @fixed_budget.markup_value
       end
+
+      should "work without the $ sign" do
+        @fixed_budget.markup = '4,000.57'
+        assert_equal 4000.57, @fixed_budget.markup_value
+      end
+      
+    end
+
+    context "with a straight amount of markup" do
+      should "equal the markup" do
+        @fixed_budget.markup = 4000.57
+        assert_equal 4000.57, @fixed_budget.markup_value
+      end
     end
     
   end
+
+  context "#budget=" do
+    setup do
+      @fixed_budget = FixedBudget.new
+    end
+    
+    should "allow a $ string" do
+      @fixed_budget.budget = '$1,000.00'
+      assert_equal 1000.00, @fixed_budget.budget
+    end
+    
+    should "allow a plain string" do
+      @fixed_budget.budget = '1,000.00'
+      assert_equal 1000.00, @fixed_budget.budget
+    end
+    
+    should "allow a numeric value" do
+      @fixed_budget.budget = 1000.00
+      assert_equal 1000.00, @fixed_budget.budget
+    end
+    
+  end
+  
 end