diff --git a/app/views/suppliers/tables/index.html.slim b/app/views/suppliers/tables/index.html.slim index f216ca25..8af23e2e 100644 --- a/app/views/suppliers/tables/index.html.slim +++ b/app/views/suppliers/tables/index.html.slim @@ -21,7 +21,7 @@ div.page-header= title :index, model_class - @tables.each do |table| tr td.link= link_to table.number, [:suppliers, table] - td.link= link_to_if table.section.present?, table.section.try(:title), tables_view_suppliers_section_path(table.section) + td.link= link_to_if table.section.present?, table.section.try(:title), [:suppliers, table.section] td.timestamp data-time=table.created_at.try(:utc).try(:iso8601) td.actions = link_to t('helpers.links.edit'), [:edit, :suppliers, table], class: 'btn btn-mini', data: {t: 'helpers.links.edit'} diff --git a/spec/controllers/suppliers/sections_controller_spec.rb b/spec/controllers/suppliers/sections_controller_spec.rb index 59689c54..0e923f53 100644 --- a/spec/controllers/suppliers/sections_controller_spec.rb +++ b/spec/controllers/suppliers/sections_controller_spec.rb @@ -50,7 +50,7 @@ describe Suppliers::SectionsController do it "renders the #show view" do section = create :section, supplier: @supplier get :show, id: section - response.should render_template :show + response.should render_template :tables_view end end diff --git a/spec/models/order_spec.rb b/spec/models/order_spec.rb index dd63d4b8..b8a33746 100644 --- a/spec/models/order_spec.rb +++ b/spec/models/order_spec.rb @@ -31,7 +31,7 @@ describe Order do describe '.for_supplier' do before { order } it 'works' do - Order.for_supplier(supplier).should == order + Order.for_supplier(supplier).should == [order] end it 'paginates' diff --git a/spec/models/section_spec.rb b/spec/models/section_spec.rb index 44327820..31b666f5 100644 --- a/spec/models/section_spec.rb +++ b/spec/models/section_spec.rb @@ -7,28 +7,34 @@ describe :section do describe :path do describe :width do - it "should have zero width when initialized" do - Section.new.width.should be_zero + it "should have 20 width when initialized" do + Section.new.width.should == 20 end + it "should have new width when it is defined using a setter" do @section.width = 3.2 @section.width.should == 3.2 end + 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 + end describe :height do - it "should have zero height when initialized" do - Section.new.height.should be_zero + + it "should have 30 height when initialized" do + Section.new.height.should == 30 end + it "should have new height when it is defined using a setter" do @section.height = 3.2 @section.height.should == 3.2 end + it "should persist height property through database" do @section.height = 3.2 @section.save