spree_backend 3.1.0.rc1 → 3.1.0.rc2

data/spec/features/admin/products/option_types_spec.rb

@@ -55,10 +55,11 @@ describe "Option Types", type: :feature, js: true do
 
   # Regression test for #2277
   it "can remove an option value from an option type" do
-    create(:option_value)
+    option_type = create(:option_type)
+    create(:option_value, option_type: option_type)
     click_link "Option Types"
     within('table#listing_option_types') { click_icon :edit }
-    expect(page).to have_content("Editing Option Type")
+    expect(page).to have_content(option_type.name)
     expect(all("tbody#option_values tr").count).to eq(1)
     within("tbody#option_values") do
       find('.spree_remove_fields').click

data/spec/features/admin/promotions/adjustments_spec.rb

@@ -13,7 +13,8 @@ describe "Promotion Adjustments", type: :feature, js: true do
       fill_in "Name", with: "Promotion"
       fill_in "Code", with: "order"
       click_button "Create"
-      expect(page).to have_content("Editing Promotion")
+      promotion = Spree::Promotion.find_by_name("Promotion")
+      expect(page).to have_content(promotion.name)
 
       select2 "Item total", from: "Add rule of type"
       within('#rule_fields') { click_button "Add" }
@@ -30,7 +31,6 @@ describe "Promotion Adjustments", type: :feature, js: true do
       within('.calculator-fields') { fill_in "Amount", with: 5 }
       within('#actions_container') { click_button "Update" }
 
-      promotion = Spree::Promotion.find_by_name("Promotion")
       expect(promotion.code).to eq("order")
 
       first_rule = promotion.rules.first
@@ -50,7 +50,8 @@ describe "Promotion Adjustments", type: :feature, js: true do
       fill_in "Usage Limit", with: "1"
       fill_in "Code", with: "single_use"
       click_button "Create"
-      expect(page).to have_content("Editing Promotion")
+      promotion = Spree::Promotion.find_by_name("Promotion")
+      expect(page).to have_content(promotion.name)
 
       select2 "Create whole-order adjustment", from: "Add action of type"
       within('#action_fields') { click_button "Add" }
@@ -59,7 +60,6 @@ describe "Promotion Adjustments", type: :feature, js: true do
       within('#action_fields') { fill_in "Amount", with: "5" }
       within('#actions_container') { click_button "Update" }
 
-      promotion = Spree::Promotion.find_by_name("Promotion")
       expect(promotion.usage_limit).to eq(1)
       expect(promotion.code).to eq("single_use")
 
@@ -73,7 +73,9 @@ describe "Promotion Adjustments", type: :feature, js: true do
     it "should allow an admin to create an automatic promo with flat percent discount" do
       fill_in "Name", with: "Promotion"
       click_button "Create"
-      expect(page).to have_content("Editing Promotion")
+      promotion = Spree::Promotion.find_by_name("Promotion")
+
+      expect(page).to have_content(promotion.name)
 
       select2 "Item total", from: "Add rule of type"
       within('#rule_fields') { click_button "Add" }
@@ -89,7 +91,6 @@ describe "Promotion Adjustments", type: :feature, js: true do
       within('.calculator-fields') { fill_in "Flat Percent", with: "10" }
       within('#actions_container') { click_button "Update" }
 
-      promotion = Spree::Promotion.find_by_name("Promotion")
       expect(promotion.code).to be_blank
 
       first_rule = promotion.rules.first
@@ -109,7 +110,9 @@ describe "Promotion Adjustments", type: :feature, js: true do
 
       fill_in "Name", with: "Promotion"
       click_button "Create"
-      expect(page).to have_content("Editing Promotion")
+      promotion = Spree::Promotion.find_by_name("Promotion")
+
+      expect(page).to have_content(promotion.name)
 
       select2 "Product(s)", from: "Add rule of type"
       within("#rule_fields") { click_button "Add" }
@@ -123,7 +126,6 @@ describe "Promotion Adjustments", type: :feature, js: true do
       within('.calculator-fields') { fill_in "Percent", with: "10" }
       within('#actions_container') { click_button "Update" }
 
-      promotion = Spree::Promotion.find_by_name("Promotion")
       expect(promotion.code).to be_blank
 
       first_rule = promotion.rules.first
@@ -168,7 +170,9 @@ describe "Promotion Adjustments", type: :feature, js: true do
       fill_in "Name", with: "Promotion"
       fill_in "Path", with: "content/cvv"
       click_button "Create"
-      expect(page).to have_content("Editing Promotion")
+      promotion = Spree::Promotion.find_by_name("Promotion")
+
+      expect(page).to have_content(promotion.name)
 
       select2 "Create whole-order adjustment", from: "Add action of type"
       within('#action_fields') { click_button "Add" }
@@ -177,7 +181,6 @@ describe "Promotion Adjustments", type: :feature, js: true do
       within('.calculator-fields') { fill_in "Amount", with: "4" }
       within('#actions_container') { click_button "Update" }
 
-      promotion = Spree::Promotion.find_by_name("Promotion")
       expect(promotion.path).to eq("content/cvv")
       expect(promotion.code).to be_blank
       expect(promotion.rules).to be_blank
@@ -194,7 +197,9 @@ describe "Promotion Adjustments", type: :feature, js: true do
       fill_in "Name", with: "Promotion"
       fill_in "Code", with: "complex"
       click_button "Create"
-      expect(page).to have_content("Editing Promotion")
+      promotion = Spree::Promotion.find_by_name("Promotion")
+
+      expect(page).to have_content(promotion.name)
 
       select2 "Create line items", from: "Add action of type"
 
@@ -213,7 +218,6 @@ describe "Promotion Adjustments", type: :feature, js: true do
       within('.create_adjustment .calculator-fields') { fill_in "Amount", with: "40.00" }
       within('#actions_container') { click_button "Update" }
 
-      promotion = Spree::Promotion.find_by_name("Promotion")
       expect(promotion.code).to eq("complex")
 
       first_action = promotion.actions.first
@@ -224,7 +228,9 @@ describe "Promotion Adjustments", type: :feature, js: true do
     it "ceasing to be eligible for a promotion with item total rule then becoming eligible again" do
       fill_in "Name", with: "Promotion"
       click_button "Create"
-      expect(page).to have_content("Editing Promotion")
+      promotion = Spree::Promotion.find_by_name("Promotion")
+
+      expect(page).to have_content(promotion.name)
 
       select2 "Item total", from: "Add rule of type"
       within('#rule_fields') { click_button "Add" }
@@ -239,8 +245,6 @@ describe "Promotion Adjustments", type: :feature, js: true do
       within('.calculator-fields') { fill_in "Amount", with: "5" }
       within('#actions_container') { click_button "Update" }
 
-      promotion = Spree::Promotion.find_by_name("Promotion")
-
       first_rule = promotion.rules.first
       expect(first_rule.class).to eq(Spree::Promotion::Rules::ItemTotal)
       expect(first_rule.preferred_amount_min).to eq(50)

data/spec/features/admin/returns/return_authorizations_spec.rb

@@ -91,7 +91,7 @@ describe "Return Authorizations", type: :feature do
       it 'opens return authorization edit page' do
         visit spree.admin_return_authorizations_path
         click_link return_authorization.number
-        expect(page).to have_content("Return Authorization #{return_authorization.number}")
+        expect(page).to have_content(return_authorization.number)
       end
     end
 

data/spec/features/admin/users_spec.rb

@@ -40,7 +40,7 @@ describe 'Users', type: :feature do
     end
 
     it 'can go back to the users list' do
-      expect(page).to have_link Spree.user_class.model_name.human, href: spree.admin_users_path
+      expect(page).to have_link Spree.t(:users), href: spree.admin_users_path
     end
 
     it 'can navigate to the account page' do

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: spree_backend
 version: !ruby/object:Gem::Version
-  version: 3.1.0.rc1
+  version: 3.1.0.rc2
 platform: ruby
 authors:
 - Sean Schofield
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-04-07 00:00:00.000000000 Z
+date: 2016-05-05 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: spree_api
@@ -16,28 +16,28 @@ dependencies:
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 3.1.0.rc1
+        version: 3.1.0.rc2
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 3.1.0.rc1
+        version: 3.1.0.rc2
 - !ruby/object:Gem::Dependency
   name: spree_core
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 3.1.0.rc1
+        version: 3.1.0.rc2
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 3.1.0.rc1
+        version: 3.1.0.rc2
 - !ruby/object:Gem::Dependency
   name: bootstrap-sass
   requirement: !ruby/object:Gem::Requirement