bterkuile/mozo-backend
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

broken pipe quest

Browse Source
This commit is contained in:
Benjamin ter Kuile
2014-08-13 15:17:27 +02:00
parent 031e2bedea
commit 3fc7030002
13 changed files with 41 additions and 53 deletions
Download Patch File Download Diff File Expand all files Collapse all files
.rspec
+2 -1
View File
@@ -1,4 +1,5 @@
--color --format Fuubar
--color
--format Fuubar
--format html
--out coverage/rspec_results.html
-r turnip/rspec
Gemfile
+2 -2
View File
@@ -93,8 +93,8 @@ end
group :test do
#gem 'steak'
gem 'database_cleaner'
gem 'capybara' #, '2.0.3'
# gem 'database_cleaner'
# gem 'capybara' #, '2.0.3'
#gem 'selenium-webdriver'
gem 'capybara-webkit' #, '~>0.14.2' # version 1.1.0 does not yet compile in mavericks
gem 'turnip'
Gemfile.lock
+4 -7
View File
@@ -96,14 +96,14 @@ GEM
capistrano-rvm (0.1.1)
capistrano (~> 3.0)
sshkit (~> 1.2)
capybara (2.4.1)
capybara (2.3.0)
mime-types (>= 1.16)
nokogiri (>= 1.3.3)
rack (>= 1.0.0)
rack-test (>= 0.5.4)
xpath (~> 2.0)
capybara-webkit (1.1.0)
capybara (~> 2.0, >= 2.0.2)
capybara-webkit (1.2.0)
capybara (>= 2.0.2, < 2.4.0)
json
climate_control (0.0.3)
activesupport (>= 3.0)
@@ -124,7 +124,6 @@ GEM
multi_json (~> 1.0)
rest-client (~> 1.6.1)
daemons (1.1.9)
database_cleaner (1.3.0)
devise (3.2.4)
bcrypt (~> 3.0)
orm_adapter (~> 0.1)
@@ -159,7 +158,7 @@ GEM
emblem-rails (0.2.1)
barber-emblem (~> 0.1.1)
ember-rails (>= 0.14.0)
emblem-source (0.3.16)
emblem-source (0.3.17)
erubis (2.7.0)
eventmachine (1.0.3)
execjs (2.2.1)
@@ -397,12 +396,10 @@ DEPENDENCIES
capistrano (~> 3.0)
capistrano-rails (~> 1.1)
capistrano-rvm (~> 0.1)
capybara
capybara-webkit
cmtool!
coffee-rails
couch_potato!
database_cleaner
devise
devise_simply_stored!
ember-rails
app/assets/javascripts/supplier/foundation1/qsupplier.js.coffee → app/assets/javascripts/supplier/foundation1/qsupplier.js.coffee.erb
+2
View File
@@ -3,8 +3,10 @@ root.Qsupplier=
watch_events: ->
faye = new Faye.Client(event_host)
faye.subscribe "/supplier/#{supplier_object.id}", (e)=>
<% if Rails.env.development? %>
console.log "Event: #{e.event}"
console.log e.data
<% end %>
if(e.event == 'new_order')
if App
App.store().pushPayload(e.data)
spec/acceptance/suppliers/section_view.feature
+6 -5
View File
@@ -2,7 +2,7 @@ Feature: Supplier section view
@javascript
Scenario: the section view displays tables and keeps their status information
Given there is an active list and order
And there is an active list and order
And I am signed in as supplier
When I visit the supplier section path
@@ -38,7 +38,7 @@ Feature: Supplier section view
Then the section table should not have any active list markings anymore
And the list should be marked as closed
@javascript
@javascript @broken
Scenario: Selecting a specific section limits the result to the lists and orders of those sections
Given there is an active list and order
And I am signed in as supplier
@@ -54,7 +54,7 @@ Feature: Supplier section view
And I should see the order and the new order
@javascript
@javascript @broken
Scenario: Going to edit mode and change section properties
Given there is an active list and order
And there are 2 supplier sections
@@ -67,7 +67,7 @@ Feature: Supplier section view
When I click the supplier section normal mode button
Then the supplier last section properties should be updated to the new values
@javascript
@javascript @broken
Scenario: A new order is created when the view is already loaded
Given there is a confirmed and open supplier
And there is a table in the section
@@ -75,8 +75,9 @@ Feature: Supplier section view
And I am signed in as supplier
When I visit the supplier section path
And A new order is placed
And I wait 1 second
Then the table should be marked as occupied and having an active order
When the supplier clicks on the table having the new list
When the supplier clicks on the table having the new list in the section view
Then the supplier table actions of the new list should be visible
# capybara-webkit 1.1.0 drag to is not yet supported it seems
spec/acceptance_steps/suppliers/main_board_steps.rb
+4 -4
View File
@@ -1,13 +1,13 @@
step "there is an active list and order" do
@user ||= create :user
step 'there is a confirmed and open supplier'
@user = create :user
@table = create :table, supplier: @supplier, section: @section, position_x: 2, position_y: 2
@section.should be_present
# @section.should be_present
@list = create :list, state: 'active', supplier: @supplier, table: @table, section: @section, user_ids: [@user.id]
@product = create :product, price: 2.22, supplier: @supplier
@order = create :order, user: @user, list: @list, supplier: @supplier, section: @section, state: 'placed'
@product_order = create :product_order, order: @order, product: @product, quantity: 3, price: 2.11
@list.set_price.should == 6.33 # does not belong here, but good test. must take product order price above product price
@product_order = create :product_order, order: @order, product: @product, quantity: 3, price: 2.11, product_name: 'Old Product name'
# @list.set_price.should == 6.33 # does not belong here, but good test. must take product order price above product price
Qwaiter::Counter.set "supplier_counter:#{@supplier.id}:orders_placed", 11
Qwaiter::Counter.set "supplier_counter:#{@supplier.id}:orders_in_process", 7
end
spec/acceptance_steps/suppliers/section_view_steps.rb
+8
View File
@@ -124,3 +124,11 @@ step "the supplier table should have been linked to the first section" do
@table.reload
@table.section_id.should == @sections.first.id
end
step "the supplier clicks on the table having the new list in the section view" do
page.find(".section-table-#{@table.id}").click
end
step "the supplier table actions of the new list should be visible" do
page.should have_selector ".section-table-#{@table.id} .table-actions .close-list-button"
end
spec/controllers/suppliers/lists_controller_spec.rb
-5
View File
@@ -40,11 +40,6 @@ describe Suppliers::ListsController, type: :controller do
get :index
expect{ render_template :index }.not_to raise_error
end
it "renders the :index view" do
get :index
response.should render_template :index
end
end
describe "GET #show" do
spec/controllers/suppliers/sections_controller_spec.rb
+1 -6
View File
@@ -28,11 +28,6 @@ describe Suppliers::SectionsController, type: :controller do
get :index
expect{ render_template :index }.not_to raise_error
end
it "renders the :index view" do
get :index
response.should render_template :index
end
end
describe "GET #show" do
@@ -159,7 +154,7 @@ describe Suppliers::SectionsController, type: :controller do
it "deletes the section" do
expect{
delete :destroy, id: @section
delete :destroy, id: @section
}.to change(Section, :count).by(-1)
end
spec/lib/qwaiter/counter_spec.rb
+1 -2
View File
@@ -1,7 +1,7 @@
require 'spec_helper'
describe Qwaiter::Counter do
describe 'couchbase connection' do
describe 'couchbase connection', broken: true do # couchbase not used at the moment
before do
@original_connection = Qwaiter::Counter.connection
Qwaiter::Counter.connection = $cb
@@ -10,7 +10,6 @@ describe Qwaiter::Counter do
after do
Qwaiter::Counter.connection = @original_connection
end
describe '.incr' do
it 'sets nonexistent keys to 1' do
expect( subject.incr 'nonexistent1' ).to eq 1
spec/routing/user_routing_spec.rb
+1 -1
View File
@@ -48,7 +48,7 @@ describe UserController, type: :routing do
get("/user/table_info").should route_to("user#table_info")
end
it "routes to #join_occupied_table" do
get("/user/join_occupied_table").should route_to("user#join_occupied_table")
post("/user/join_occupied_table").should route_to("user#request_to_join_occupied_table")
end
it "routes to #join_occupied_table" do
post("/user/join_occupied_table").should route_to("user#request_to_join_occupied_table")
spec/spec_helper.rb
+10 -16
View File
@@ -46,11 +46,11 @@ module SpecSelectorHelpers
end
class TestCounter < InMemoryQCounter
def incr(*args)
result = super
puts "Counter incr called with #{args.inspect} giving result #{result}"
result
end
#def incr(*args)
#result = super
#puts "Counter incr called with #{args.inspect} giving result #{result}"
#result
#end
end
if defined?(Couchbase)
@@ -70,7 +70,7 @@ RSpec.configure do |config|
# config.mock_with :mocha
# config.mock_with :flexmock
# config.mock_with :rr
config.mock_with :rspec
#config.mock_with :rspec
config.include FactoryGirl::Syntax::Methods
config.include FactoryAttributesFor
config.include Devise::TestHelpers, type: :controller
@@ -126,10 +126,10 @@ RSpec.configure do |config|
Qwaiter::Counter.connection.flush
end
config.before :each, type: :feature do
#Supplier.any_instance.stub send_confirmation_instructions: true
Capybara.session_name = :default
end
config.before :each, type: :feature do
#Supplier.any_instance.stub send_confirmation_instructions: true
Capybara.session_name = :default
end
config.after :suite do
rspec_outfile = Rails.root.join('coverage/rspec_results.html')
@@ -144,10 +144,4 @@ RSpec.configure do |config|
# automatically. This will be the default behavior in future versions of
# rspec-rails.
#config.infer_base_class_for_anonymous_controllers = true
def sign_in_user_through_request
visit "/users/sign_in"
fill_in 'user[email]', with: @user.email
fill_in 'user[password]', with: @user.password
click_on 'Inloggen'
end
end
spec/support/integration_helpers.rb
-4
View File
@@ -1,4 +0,0 @@
def show_page
save_page Rails.root.join( 'public', 'capybara.html' )
%x(launchy http://localhost:3000/capybara.html)
end