Mixed commit, user facebook issues

This commit is contained in:
2014-08-11 17:54:43 +02:00
parent 28192f8e39
commit 031e2bedea
19 changed files with 95 additions and 77 deletions
+1 -1
View File
@@ -1,7 +1,7 @@
Feature: Active list view
@javascript
Scenario: Loading lists and switching back to the active list
Scenario: Loading lists and switching back to the active list works, lists loading may unlink active list orders
Given There is an open supplier with a menu
And there is a signed in user with an active order
And the user is on the active list page
+2 -1
View File
@@ -22,7 +22,8 @@ step "I wait :number second/seconds" do |number|
end
placeholder :number do
match /[-+]?\d+(\.\d+)?/ do |number_string|
# match /[-+]?\d+(\.\d+)?/ do |number_string|
match /\d+\.?\d?/ do |number_string|
number_string.to_f
end
end
@@ -31,9 +31,9 @@ step "the section table should not be marked as in need of help" do
table['class'].should_not include 'needs_help'
end
step 'Then the table should be marked as occupied and having an active order' do
step 'the table should be marked as occupied and having an active order' do
classes = find(".section-table-#{@table.id}")['class'].split(/\s+/)
expect(classes & %w[occupied active_order]).to eq & %w[occupied active_order]
expect(classes & %w[occupied active_order]).to eq %w[occupied active_order]
end
step "I click on section table as a supplier" do
@@ -70,7 +70,6 @@ end
step "the section table should not have any active list markings anymore" do
table = page.find(".section-table-#{@table.id}")
css_class = table['class']
binding.pry
css_class.should_not include 'needs_help'
css_class.should_not include 'occupied'
css_class.should_not include 'active_order'
@@ -80,7 +79,8 @@ end
step "I should be redirected to the supplier section view" do
sleep 1
#page.current_path.should == "/supplier/sections/#{@section.id}"
page.evaluate_script('window.location.pathname').should == "/supplier/sections/#{@section.id}"
# page.evaluate_script('window.location.pathname').should == "/supplier/sections/#{@section.id}"
js_path.should == "/supplier#/sections/#{@section.id}"
end
step "the last supplier section has a table with known coordinates" do
-1
View File
@@ -118,7 +118,6 @@ RSpec.configure do |config|
#config.use_transactional_fixtures = true
config.before :suite do
Qwaiter::Couchbase.load_design_docs!
# NOT THREADSAFE!!!!!! but good enough for testing since the real couchbase flush is slowwwwww....
Qwaiter::Counter.connection = TestCounter.new
end