diff --git a/spec/models/order_spec.rb b/spec/models/order_spec.rb index 31858fe0..94c02b3e 100644 --- a/spec/models/order_spec.rb +++ b/spec/models/order_spec.rb @@ -2,13 +2,14 @@ require 'spec_helper' describe Order do - let(:supplier) { create :supplier } - let(:user) { create :user } - let(:section) { create :section, supplier: supplier} - let(:table) { create :table, supplier: supplier} - let(:list){ create :list, supplier: supplier, table: table, user_ids: [user.id] } - let(:order_options){ {supplier: supplier, list: list, state: 'placed' } } - let(:order) {create :order, order_options } + let(:supplier) { create :supplier } + let(:user) { create :user } + let(:section) { create :section, supplier: supplier} + let(:table) { create :table, supplier: supplier} + let(:list) { create :list, supplier: supplier, table: table, user_ids: [user.id] } + let(:order_options) { {supplier: supplier, list: list, state: 'placed'} } + let(:order) { create :order, order_options } + subject { order } its(:placed?) { should be true } @@ -16,12 +17,15 @@ describe Order do describe 'count_active_for_supplier_and_list' do before { order } + it 'counts active orders for a list with objects' do Order.count_active_for_supplier_and_list(supplier, list).should == 1 end + it 'counts active orders for a list with ids' do Order.count_active_for_supplier_and_list(supplier.id, list.id).should == 1 end + it 'does not count inactive orders' do order.close! Order.count_active_for_supplier_and_list(supplier, list).should == 0 @@ -31,6 +35,7 @@ describe Order do describe '.for_supplier' do before { order } + it 'works' do Order.for_supplier(supplier).should == [order] end diff --git a/spec/models/section_spec.rb b/spec/models/section_spec.rb index f238a14b..8e0129fc 100644 --- a/spec/models/section_spec.rb +++ b/spec/models/section_spec.rb @@ -1,8 +1,9 @@ require 'spec_helper' describe :section do + let(:supplier) { create :supplier } before :each do - @section = build :section, path: [[10, 30], [20,30], [20,40], [10, 40]] + @section = build :section, supplier: supplier, path: [[10, 30], [20,30], [20,40], [10, 40]] end it "creates without problem" do @@ -23,6 +24,7 @@ describe :section do it "should persist width property through database" do @section.width = 3.2 @section.save + @reloaded_section = Section.find(@section.id) @reloaded_section.width.should == 3.2 end