raggedstaff/openfoodnetwork
1
0
Fork 0
mirror of https://github.com/openfoodfoundation/openfoodnetwork synced 2026-01-24 20:36:49 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'capybara-fails' into bom

Browse Source
This commit is contained in:
Rob H
2014-03-28 13:52:17 +11:00
parent ab14bf70ab 73271fa45a
commit 771ccc6e76
10 changed files with 132 additions and 66 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
app/assets/javascripts/darkswarm/controllers/forgot_sidebar_controller.js.coffee
View File

@@ -1,6 +1,21 @@
window.ForgotSidebarCtrl = Darkswarm.controller "ForgotSidebarCtrl", ($scope, $http, $location) ->
$scope.spree_user = {
email: null
}
$scope.active = ->
$location.path() == '/forgot'
$scope.select = ->
$location.path("/forgot")
$scope.submit = ->
if $scope.spree_user.email != null
$http.post("/user/spree_user/password", {spree_user: $scope.spree_user}).success (data)->
$location.path("/reset")
.error (data) ->
$scope.errors = "Email address not found"
else
$scope.errors = "You must provide an email address"

17
app/controllers/user_passwords_controller.rb
View File

@@ -1,3 +1,20 @@
class UserPasswordsController < Spree::UserPasswordsController
def create
self.resource = resource_class.send_reset_password_instructions(params[resource_name])
if resource.errors.empty?
set_flash_message(:notice, :send_instructions) if is_navigational_format?
respond_with resource, :location => spree.login_path
else
respond_to do |format|
format.html do
respond_with_navigational(resource) { render :new }
end
format.js do
render json: resource.errors, status: :unauthorized
end
end
end
end
end

19
app/views/shared/_forgot_sidebar.html.haml
View File

@@ -2,4 +2,21 @@
heading: "Forgot Password?",
active: "active()",
select: "select()"}
Well you're a bit stupid then
{{ spree_user.email }}
%form{"ng-submit" => "submit()"}
.alert-box.alert{"ng-show" => "errors != null"}
{{ errors }}
.row
.large-12.columns
%label{for: "email"} Email
%input.title.input-text{name: "email",
type: "email",
tabindex: 1,
"ng-model" => "spree_user.email"}
.row
.large-12.columns
%input.button.primary{name: "commit",
tabindex: "3",
type: "submit",
value: "Reset password"}

10
app/views/spree/admin/products/bulk_edit.html.haml
View File

@@ -24,15 +24,15 @@
%div{ :class => "four columns alpha" }
Column:
%br.clear
%select.select2.fullwidth{ 'ng-model' => 'filterProperty', :name => "filter_property", 'ng-options' => 'fc.name for fc in filterableColumns' }
%select.select2.fullwidth{ 'ng-model' => 'filterProperty', :id => "filter_property", 'ng-options' => 'fc.name for fc in filterableColumns' }
%div{ :class => "four columns omega" }
Filter Type:
%br.clear
%select.select2.fullwidth{ 'ng-model' => 'filterPredicate', :name => "filter_predicate", 'ng-options' => 'ft.name for ft in filterTypes' }
%select.select2.fullwidth{ 'ng-model' => 'filterPredicate', :id => "filter_predicate", 'ng-options' => 'ft.name for ft in filterTypes' }
%div{ :class => "six columns omega" }
Value:
%br.clear
%input{ :class => "four columns alpha", 'ng-model' => 'filterValue', :name => "filter_value", :type => "text", 'placeholder' => 'Filter Value' }
%input{ :class => "four columns alpha", 'ng-model' => 'filterValue', :id => "filter_value", :type => "text", 'placeholder' => 'Filter Value' }
%div{ :class => "two columns omega" }
&nbsp;
%input.fullwidth{ :name => "add_filter", :value => "Apply Filter", :type => "button", "ng-click" => "addFilter({property:filterProperty,predicate:filterPredicate,value:filterValue})" }
@@ -108,7 +108,7 @@
%th{ 'ng-show' => 'columns.available_on.visible' } Av. On
%th.actions
%tbody{ 'ng-repeat' => 'product in filteredProducts = (products | filter:query)', 'ng-class-even' => "'even'", 'ng-class-odd' => "'odd'", 'ng-show' => "$index >= perPage*(currentPage-1) && $index < perPage*currentPage" }
%tr.product
%tr.product{ :id => "p_{{product.id}}" }
%td.left-actions
%a{ 'ofn-toggle-variants' => 'true', :class => "view-variants icon-chevron-right", 'ng-show' => 'hasVariants(product)' }
%a{ :class => "add-variant icon-plus-sign", 'ng-click' => "addVariant(product)", 'ng-show' => "!hasVariants(product) && hasUnit(product)" }
@@ -118,7 +118,7 @@
%input{ 'ng-model' => "product.name", :name => 'product_name', 'ofn-track-product' => 'name', :type => 'text' }
%td.unit{ 'ng-show' => 'columns.unit.visible' }
%select.select2{ 'ng-model' => 'product.variant_unit_with_scale', :name => 'variant_unit_with_scale', 'ofn-track-product' => 'variant_unit_with_scale', 'ng-options' => 'unit[1] as unit[0] for unit in variant_unit_options' }
%option{'value' => '', 'ng-hide' => "hasVariants(product)"}
%option{'value' => '', 'ng-hide' => "hasVariants(product) && hasUnit(product)"}
%input{ 'ng-model' => 'product.master.unit_value_with_description', :name => 'master_unit_value_with_description', 'ofn-track-product' => 'master.unit_value_with_description', :type => 'text', :placeholder => 'value', 'ng-show' => "!hasVariants(product) && hasUnit(product)" }
%input{ 'ng-model' => 'product.variant_unit_name', :name => 'variant_unit_name', 'ofn-track-product' => 'variant_unit_name', :placeholder => 'unit', 'ng-show' => "product.variant_unit_with_scale == 'items'", :type => 'text' }
%td{ 'ng-show' => 'columns.price.visible' }

1
config/environments/development.rb
View File

@@ -30,6 +30,7 @@ Openfoodnetwork::Application.configure do
# Show emails using Letter Opener
config.action_mailer.delivery_method = :letter_opener
config.action_mailer.default_url_options = { host: "test.com" }
end

2
config/routes.rb
View File

@@ -75,7 +75,7 @@ Spree::Core::Engine.routes.draw do
:class_name => 'Spree::User',
:controllers => { :sessions => 'spree/user_sessions',
:registrations => 'user_registrations',
:passwords => 'spree/user_passwords' },
:passwords => 'user_passwords' },
:skip => [:unlocks, :omniauth_callbacks],
:path_names => { :sign_out => 'logout' },
:path_prefix => :user

11
spec/controllers/user_passwords_controller_spec.rb
View File

@@ -8,7 +8,7 @@ describe UserPasswordsController do
ActionMailer::Base.default_url_options[:host] = "test.host"
end
it "returns errors when no data received" do
it "returns errors" do
spree_post :create, spree_user: {}
response.should be_success
response.should render_template "spree/user_passwords/new"
@@ -20,5 +20,12 @@ describe UserPasswordsController do
response.should be_redirect
end
describe "via ajax" do
it "returns errors" do
xhr :post, :create, spree_user: {}, use_route: :spree
json = JSON.parse(response.body)
response.status.should == 401
json.should == {"email"=>["can't be blank"]}
end
end
end

69
spec/features/admin/bulk_order_management_spec.rb
View File

@@ -46,9 +46,9 @@ feature %q{
visit '/admin/orders/bulk_management'
end
it "displays a 'loading' splash for line items" do
page.should have_selector "div.loading", :text => "Loading Line Items..."
end
#it "displays a 'loading' splash for line items" do
# page.should have_selector "div.loading", :text => "Loading Line Items..."
#end
it "displays a list of line items" do
page.should have_selector "tr#li_#{li1.id}"
@@ -182,7 +182,6 @@ feature %q{
page.should have_selector "div.option_tab_titles h6.unselected", :text => "Toggle Columns"
page.should have_selector "div.option_tab_titles h6.selected", :text => "Filter Line Items"
page.should have_selector "div.filters", :visible => true
page.should have_selector "li.column-list-item", text: "Producer"
first("div.option_tab_titles h6", :text => "Filter Line Items").click
@@ -236,75 +235,88 @@ feature %q{
before :each do
visit '/admin/orders/bulk_management'
first("div.option_tab_titles h6", :text => "Filter Line Items").click
end
it "displays a select box for producers, which filters line items by the selected supplier" do
page.should have_select "supplier_filter", with_options: [s1.name,s2.name]
supplier_names = ["All"]
Enterprise.is_primary_producer.each{ |e| supplier_names << e.name }
find("div.select2-container#s2id_supplier_filter").click
supplier_names.each { |sn| page.should have_selector "div.select2-drop-active ul.select2-results li", text: sn }
find("div.select2-container#s2id_supplier_filter").click
page.should have_selector "tr#li_#{li1.id}", visible: true
page.should have_selector "tr#li_#{li2.id}", visible: true
select s1.name, from: "supplier_filter"
select2_select s1.name, from: "supplier_filter"
page.should have_selector "tr#li_#{li1.id}", visible: true
page.should_not have_selector "tr#li_#{li2.id}", visible: true
end
it "displays all line items when 'All' is selected from supplier filter" do
select s1.name, from: "supplier_filter"
select2_select s1.name, from: "supplier_filter"
page.should have_selector "tr#li_#{li1.id}", visible: true
page.should_not have_selector "tr#li_#{li2.id}", visible: true
select "All", from: "supplier_filter"
select2_select "All", from: "supplier_filter"
page.should have_selector "tr#li_#{li1.id}", visible: true
page.should have_selector "tr#li_#{li2.id}", visible: true
end
it "displays a select box for distributors, which filters line items by the selected distributor" do
page.should have_select "distributor_filter", with_options: [d1.name,d2.name]
distributor_names = ["All"]
Enterprise.is_distributor.each{ |e| distributor_names << e.name }
find("div.select2-container#s2id_distributor_filter").click
distributor_names.each { |dn| page.should have_selector "div.select2-drop-active ul.select2-results li", text: dn }
find("div.select2-container#s2id_distributor_filter").click
page.should have_selector "tr#li_#{li1.id}", visible: true
page.should have_selector "tr#li_#{li2.id}", visible: true
select d1.name, from: "distributor_filter"
select2_select d1.name, from: "distributor_filter"
page.should have_selector "tr#li_#{li1.id}", visible: true
page.should_not have_selector "tr#li_#{li2.id}", visible: true
end
it "displays all line items when 'All' is selected from distributor filter" do
select d1.name, from: "distributor_filter"
select2_select d1.name, from: "distributor_filter"
page.should have_selector "tr#li_#{li1.id}", visible: true
page.should_not have_selector "tr#li_#{li2.id}", visible: true
select "All", from: "distributor_filter"
select2_select "All", from: "distributor_filter"
page.should have_selector "tr#li_#{li1.id}", visible: true
page.should have_selector "tr#li_#{li2.id}", visible: true
end
it "displays a select box for order cycles, which filters line items by the selected order cycle" do
page.should have_select "order_cycle_filter", with_options: [oc1.name,oc2.name]
order_cycle_names = ["All"]
OrderCycle.all.each{ |oc| order_cycle_names << oc.name }
find("div.select2-container#s2id_order_cycle_filter").click
order_cycle_names.each { |ocn| page.should have_selector "div.select2-drop-active ul.select2-results li", text: ocn }
find("div.select2-container#s2id_order_cycle_filter").click
page.should have_selector "tr#li_#{li1.id}", visible: true
page.should have_selector "tr#li_#{li2.id}", visible: true
select oc1.name, from: "order_cycle_filter"
select2_select oc1.name, from: "order_cycle_filter"
page.should have_selector "tr#li_#{li1.id}", visible: true
page.should_not have_selector "tr#li_#{li2.id}", visible: true
end
it "displays all line items when 'All' is selected from order_cycle filter" do
select oc1.name, from: "order_cycle_filter"
select2_select oc1.name, from: "order_cycle_filter"
page.should have_selector "tr#li_#{li1.id}", visible: true
page.should_not have_selector "tr#li_#{li2.id}", visible: true
select "All", from: "order_cycle_filter"
select2_select "All", from: "order_cycle_filter"
page.should have_selector "tr#li_#{li1.id}", visible: true
page.should have_selector "tr#li_#{li2.id}", visible: true
end
it "allows filters to be used in combination" do
select oc1.name, from: "order_cycle_filter"
select2_select oc1.name, from: "order_cycle_filter"
page.should have_selector "tr#li_#{li1.id}", visible: true
page.should_not have_selector "tr#li_#{li2.id}", visible: true
select d1.name, from: "distributor_filter"
select s1.name, from: "supplier_filter"
select2_select d1.name, from: "distributor_filter"
select2_select s1.name, from: "supplier_filter"
page.should have_selector "tr#li_#{li1.id}", visible: true
page.should_not have_selector "tr#li_#{li2.id}", visible: true
select d2.name, from: "distributor_filter"
select s2.name, from: "supplier_filter"
select2_select d2.name, from: "distributor_filter"
select2_select s2.name, from: "supplier_filter"
page.should_not have_selector "tr#li_#{li1.id}", visible: true
page.should_not have_selector "tr#li_#{li2.id}", visible: true
select oc2.name, from: "order_cycle_filter"
select2_select oc2.name, from: "order_cycle_filter"
page.should_not have_selector "tr#li_#{li1.id}", visible: true
page.should have_selector "tr#li_#{li2.id}", visible: true
end
@@ -347,6 +359,7 @@ feature %q{
before :each do
visit '/admin/orders/bulk_management'
first("div.option_tab_titles h6", :text => "Filter Line Items").click
end
it "displays date fields for filtering orders, with default values set" do
@@ -363,7 +376,6 @@ feature %q{
end
it "displays only line items whose orders meet the date restriction criteria, when changed" do
first("div.option_tab_titles h6", :text => "Filter Line Items").click
fill_in "start_date_filter", :with => (Date.today - 9).strftime("%F %T")
page.should have_selector "tr#li_#{li1.id}", visible: true
page.should have_selector "tr#li_#{li2.id}", visible: true
@@ -381,7 +393,6 @@ feature %q{
li2_quantity_column.fill_in "quantity", :with => li2.quantity + 1
page.should_not have_button "IGNORE"
page.should_not have_button "SAVE"
first("div.option_tab_titles h6", :text => "Filter Line Items").click
fill_in "start_date_filter", :with => (Date.today - 9).strftime("%F %T")
page.should have_button "IGNORE"
page.should have_button "SAVE"
@@ -391,7 +402,6 @@ feature %q{
within("tr#li_#{li2.id} td.quantity") do
page.fill_in "quantity", :with => (li2.quantity + 1).to_s
end
first("div.option_tab_titles h6", :text => "Filter Line Items").click
fill_in "start_date_filter", :with => (Date.today - 9).strftime("%F %T")
click_button "SAVE"
page.should_not have_selector "input[name='quantity'].update-pending"
@@ -404,7 +414,6 @@ feature %q{
within("tr#li_#{li2.id} td.quantity") do
page.fill_in "quantity", :with => (li2.quantity + 1).to_s
end
first("div.option_tab_titles h6", :text => "Filter Line Items").click
fill_in "start_date_filter", :with => (Date.today - 9).strftime("%F %T")
click_button "IGNORE"
page.should_not have_selector "input[name='quantity'].update-pending"
@@ -438,7 +447,9 @@ feature %q{
end
it "displays a bulk action select box with a list of actions" do
page.should have_select "bulk_actions", :options => ["Delete"]
list_of_actions = ['Delete']
find("div.select2-container#s2id_bulk_actions").click
list_of_actions.each { |a| page.should have_selector "div.select2-drop-active ul.select2-results li", text: a }
end
it "displays a bulk action button" do
@@ -452,7 +463,7 @@ feature %q{
within("tr#li_#{li2.id} td.bulk") do
check "bulk"
end
select "Delete", :from => "bulk_actions"
select2_select "Delete", :from => "bulk_actions"
click_button "bulk_execute"
page.should have_selector "tr#li_#{li1.id}", visible: true
page.should_not have_selector "tr#li_#{li2.id}", visible: true
@@ -472,7 +483,7 @@ feature %q{
it "only applies the delete action to filteredLineItems" do
check "toggle_bulk"
fill_in "quick_search", with: o1.number
select "Delete", :from => "bulk_actions"
select2_select "Delete", :from => "bulk_actions"
click_button "bulk_execute"
fill_in "quick_search", with: ''
page.should_not have_selector "tr#li_#{li1.id}", visible: true

48
spec/features/admin/bulk_product_update_spec.rb
View File

@@ -21,14 +21,6 @@ feature %q{
login_to_admin_section
end
it "displays a 'loading' splash for products" do
FactoryGirl.create(:simple_product)
visit '/admin/products/bulk_edit'
page.should have_selector "div.loading", :text => "Loading Products..."
end
it "displays a list of products" do
p1 = FactoryGirl.create(:product)
p2 = FactoryGirl.create(:product)
@@ -80,6 +72,8 @@ feature %q{
p2 = FactoryGirl.create(:product, available_on: Date.today-1)
visit '/admin/products/bulk_edit'
first("div.option_tab_titles h6", :text => "Toggle Columns").click
first("li.column-list-item", text: "Available On").click
page.should have_field "available_on", with: p1.available_on.strftime("%F %T")
page.should have_field "available_on", with: p2.available_on.strftime("%F %T")
@@ -186,7 +180,7 @@ feature %q{
visit '/admin/products/bulk_edit'
page.should have_selector "a.view-variants"
first("a.view-variants").click
all("a.view-variants").each{ |e| e.click }
page.should have_field "product_name", with: v1.product.name
page.should have_field "product_name", with: v2.product.name
@@ -200,6 +194,7 @@ feature %q{
v2 = FactoryGirl.create(:variant, product: p1, is_master: false, on_hand: 6)
visit '/admin/products/bulk_edit'
all("a.view-variants").each{ |e| e.click }
page.should have_selector "span[name='on_hand']", text: "21"
page.should have_field "variant_on_hand", with: "15"
@@ -213,8 +208,9 @@ feature %q{
v2 = FactoryGirl.create(:variant, product: p1, is_master: false, price: 2.50)
visit '/admin/products/bulk_edit'
all("a.view-variants").each{ |e| e.click }
page.should have_field "price", with: "2.0"
page.should have_field "price", with: "2.0", visible: false
page.should have_field "variant_price", with: "12.75"
page.should have_field "variant_price", with: "2.5"
end
@@ -225,8 +221,8 @@ feature %q{
v2 = FactoryGirl.create(:variant, product: p1, is_master: false, price: 2.50, unit_value: 4800, unit_description: "(large bag)")
visit '/admin/products/bulk_edit'
all("a.view-variants").each{ |e| e.click }
page.should have_field "price", with: "2.0"
page.should have_field "variant_unit_value_with_description", with: "1.2 (small bag)"
page.should have_field "variant_unit_value_with_description", with: "4.8 (large bag)"
end
@@ -344,7 +340,7 @@ feature %q{
page.should have_field "product_name", with: "Big Bag Of Potatoes"
page.should have_select "supplier", selected: s2.name
page.should have_field "available_on", with: (Date.today-3).strftime("%F %T")
page.should have_field "available_on", with: (Date.today-3).strftime("%F %T"), visible: false
page.should have_field "price", with: "20.0"
page.should have_select "variant_unit_with_scale", selected: "Weight (kg)"
page.should have_field "on_hand", with: "18"
@@ -371,7 +367,6 @@ feature %q{
page.should have_field "variant_unit_name", with: "loaf"
end
scenario "setting a variant unit on a product that has none" do
p = FactoryGirl.create(:product, variant_unit: nil, variant_unit_scale: nil)
v = FactoryGirl.create(:variant, product: p, unit_value: nil, unit_description: nil)
@@ -379,23 +374,23 @@ feature %q{
login_to_admin_section
visit '/admin/products/bulk_edit'
first("a.view-variants").click
page.should have_select "variant_unit_with_scale", selected: ''
select "Weight (kg)", from: "variant_unit_with_scale"
first("a.view-variants").click
fill_in "variant_unit_value_with_description", with: '123 abc'
click_button 'Update'
page.find("span#update-status-message").should have_content "Update complete"
visit '/admin/products/bulk_edit'
first("a.view-variants").click
page.should have_select "variant_unit_with_scale", selected: "Weight (kg)"
page.should have_field "variant_unit_value_with_description", with: "123 abc"
end
describe "setting the master unit value for a product without variants" do
it "sets the master unit value" do
p = FactoryGirl.create(:product, variant_unit: nil, variant_unit_scale: nil)
@@ -556,10 +551,11 @@ feature %q{
visit '/admin/products/bulk_edit'
page.should have_selector "div.option_tab_titles h6", :text => "Filter Products"
first("div.option_tab_titles h6", :text => "Filter Products").click
select "Name", :from => "filter_property"
select "Contains", :from => "filter_predicate"
select2_select "Name", from: "filter_property"
select2_select "Contains", from: "filter_predicate"
fill_in "filter_value", :with => "1"
click_button "Apply Filter"
page.should_not have_field "product_name", with: p2.name
@@ -652,7 +648,7 @@ feature %q{
visit '/admin/products/bulk_edit'
page.should have_selector "a.view-variants"
first("a.view-variants").click
all("a.view-variants").each { |e| e.click }
page.should have_selector "a.edit-variant", :count => 3
@@ -712,7 +708,6 @@ feature %q{
page.should have_selector "div.option_tab_titles h6.unselected", :text => "Toggle Columns"
page.should have_selector "div.option_tab_titles h6.selected", :text => "Filter Products"
page.should have_selector "div.filters", :visible => true
page.should have_selector "li.column-list-item", text: "Available On"
first("div.option_tab_titles h6", :text => "Filter Products").click
@@ -838,8 +833,8 @@ feature %q{
page.should have_selector "div.option_tab_titles h6", :text => "Filter Products"
first("div.option_tab_titles h6", :text => "Filter Products").click
page.should have_select "filter_property", :with_options => ["Supplier", "Name"]
page.should have_select "filter_predicate", :with_options => ["Equals", "Contains"]
page.should have_select "filter_property", visible: false
page.should have_select "filter_predicate", visible: false
page.should have_field "filter_value"
end
@@ -853,8 +848,8 @@ feature %q{
first("div.option_tab_titles h6", :text => "Filter Products").click
select "Name", :from => "filter_property"
select "Equals", :from => "filter_predicate"
select2_select "Name", :from => "filter_property"
select2_select "Equals", :from => "filter_predicate"
fill_in "filter_value", :with => "Product1"
click_button "Apply Filter"
end
@@ -881,10 +876,6 @@ feature %q{
page.should_not have_text "Name Equals Product1"
end
it "displays the 'loading' splash" do
page.should have_selector "div.loading", :text => "Loading Products..."
end
it "loads appropriate products" do
page.should have_field "product_name", :with => "Product1"
page.should have_field "product_name", :with => "Product2"
@@ -939,7 +930,6 @@ feature %q{
p = product_supplied
visit '/admin/products/bulk_edit'
first("div.option_tab_titles h6", :text => "Toggle Columns").click
first("li.column-list-item", text: "Available On").click
@@ -959,6 +949,8 @@ feature %q{
page.find("span#update-status-message").should have_content "Update complete"
visit '/admin/products/bulk_edit'
first("div.option_tab_titles h6", :text => "Toggle Columns").click
first("li.column-list-item", text: "Available On").click
page.should have_field "product_name", with: "Big Bag Of Potatoes"
page.should have_select "supplier", selected: s2.name

6
spec/support/request/web_helper.rb
View File

@@ -105,6 +105,12 @@ module WebHelper
end
end
def select2_select(value, options)
id = options[:from]
options[:from] = "#s2id_#{id}"
targetted_select2(value, options)
end
private
def wait_for_ajax
wait_until { page.evaluate_script("$.active") == 0 }