Bundle update & restructure tests (RSpec 3)

spec/integration/receive_spec.rb

@@ -1,6 +1,6 @@
 require_relative '../spec_helper'
 
-describe 'receiving an order', :type => :feature do
+feature 'receiving an order', js: true do
   let(:admin) { create :user, groups:[create(:workgroup, role_orders: true)] }
   let(:supplier) { create :supplier }
   let(:article) { create :article, supplier: supplier, unit_quantity: 3 }
@@ -34,74 +34,69 @@ describe 'receiving an order', :type => :feature do
     expect(goa2.destroyed? ? 0 : goa2.result).to be_within(1e-3).of q2
   end
 
+  before { login admin }
 
-  describe :type => :feature, :js => true do
-    before { login admin }
-
-    it 'has product ordered visible' do
-      set_quantities [3,0], [0,0]
-      visit receive_order_path(order)
-      expect(page).to have_content(article.name)
-      expect(page).to have_selector("#order_article_#{oa.id}")
-    end
-
-    it 'has product not ordered invisible' do
-      set_quantities [0,0], [0,0]
-      visit receive_order_path(order)
-      expect(page).to_not have_selector("#order_article_#{oa.id}")
-    end
-
-    it 'is not received by default' do
-      set_quantities [3,0], [0,0]
-      visit receive_order_path(order)
-      expect(find("#order_articles_#{oa.id}_units_received").value).to eq ''
-    end
-
-    it 'does not change anything when received is ordered' do
-      set_quantities [2,0], [3,2]
-      visit receive_order_path(order)
-      fill_in "order_articles_#{oa.id}_units_received", :with => oa.units_to_order
-      find('input[type="submit"]').click
-      expect(page).to have_selector('body')
-      check_quantities 2,  2, 4
-    end
-
-    it 'redistributes properly when received is more' do
-      set_quantities [2,0], [3,2]
-      visit receive_order_path(order)
-      fill_in "order_articles_#{oa.id}_units_received", :with => 3
-      find('input[type="submit"]').click
-      expect(page).to have_selector('body')
-      check_quantities 3,  2, 5
-    end
-
-    it 'redistributes properly when received is less' do
-      set_quantities [2,0], [3,2]
-      visit receive_order_path(order)
-      fill_in "order_articles_#{oa.id}_units_received", :with => 1
-      find('input[type="submit"]').click
-      expect(page).to have_selector('body')
-      check_quantities 1,  2, 1
-    end
-
-    it 'has a locked field when edited elsewhere' do
-      set_quantities [2,0], [3,2]
-      goa1.result = goa1.result + 1
-      goa1.save!
-      visit receive_order_path(order)
-      expect(find("#order_articles_#{oa.id}_units_received")).to be_disabled
-    end
-
-    it 'leaves locked rows alone when submitted' do
-      set_quantities [2,0], [3,2]
-      goa1.result = goa1.result + 1
-      goa1.save!
-      visit receive_order_path(order)
-      find('input[type="submit"]').click
-      expect(page).to have_selector('body')
-      check_quantities 2,  3, 4
-    end
-
+  it 'has product ordered visible' do
+    set_quantities [3,0], [0,0]
+    visit receive_order_path(id: order.id)
+    expect(page).to have_content(article.name)
+    expect(page).to have_selector("#order_article_#{oa.id}")
   end
 
+  it 'has product not ordered invisible' do
+    set_quantities [0,0], [0,0]
+    visit receive_order_path(id: order.id)
+    expect(page).to_not have_selector("#order_article_#{oa.id}")
+  end
+
+  it 'is not received by default' do
+    set_quantities [3,0], [0,0]
+    visit receive_order_path(id: order.id)
+    expect(find("#order_articles_#{oa.id}_units_received").value).to be_blank
+  end
+
+  it 'does not change anything when received is ordered' do
+    set_quantities [2,0], [3,2]
+    visit receive_order_path(id: order.id)
+    fill_in "order_articles_#{oa.id}_units_received", :with => oa.units_to_order
+    find('input[type="submit"]').click
+    expect(page).to have_selector('body')
+    check_quantities 2,  2, 4
+  end
+
+  it 'redistributes properly when received is more' do
+    set_quantities [2,0], [3,2]
+    visit receive_order_path(id: order.id)
+    fill_in "order_articles_#{oa.id}_units_received", :with => 3
+    find('input[type="submit"]').click
+    expect(page).to have_selector('body')
+    check_quantities 3,  2, 5
+  end
+
+  it 'redistributes properly when received is less' do
+    set_quantities [2,0], [3,2]
+    visit receive_order_path(id: order.id)
+    fill_in "order_articles_#{oa.id}_units_received", :with => 1
+    find('input[type="submit"]').click
+    expect(page).to have_selector('body')
+    check_quantities 1,  2, 1
+  end
+
+  it 'has a locked field when edited elsewhere' do
+    set_quantities [2,0], [3,2]
+    goa1.result = goa1.result + 1
+    goa1.save!
+    visit receive_order_path(id: order.id)
+    expect(find("#order_articles_#{oa.id}_units_received")).to be_disabled
+  end
+
+  it 'leaves locked rows alone when submitted' do
+    set_quantities [2,0], [3,2]
+    goa1.result = goa1.result + 1
+    goa1.save!
+    visit receive_order_path(id: order.id)
+    find('input[type="submit"]').click
+    expect(page).to have_selector('body')
+    check_quantities 2,  3, 4
+  end
 end