From d6e7c4998f122e2c61eccb9d47a8e1939cac3f20 Mon Sep 17 00:00:00 2001 From: Benjamin ter Kuile Date: Wed, 13 Aug 2014 16:06:16 +0200 Subject: [PATCH] rspec seems to behave now --- .../javascripts/supplier/app/models/user.js.coffee | 7 ++++--- .../supplier/app/templates/section_table.emblem | 2 +- .../supplier/foundation1/qsupplier.js.coffee.erb | 4 ---- app/controllers/suppliers/lists_controller.rb | 2 +- app/serializers/order_serializer.rb | 12 ------------ spec/acceptance/suppliers/section_view.feature | 6 +++--- spec/spec_helper.rb | 2 +- 7 files changed, 10 insertions(+), 25 deletions(-) diff --git a/app/assets/javascripts/supplier/app/models/user.js.coffee b/app/assets/javascripts/supplier/app/models/user.js.coffee index 399d5cae..f437b2ef 100644 --- a/app/assets/javascripts/supplier/app/models/user.js.coffee +++ b/app/assets/javascripts/supplier/app/models/user.js.coffee @@ -5,9 +5,10 @@ App.User= DS.Model.extend name: attr('string') list: DS.belongsTo('list') # in ember scope not many to many (yet) join_requests: DS.hasMany('join_request') - facebook_image: (-> "http://graph.facebook.com/#{@get('facebook_id')}/picture?type=square").property('facebook_id') facebook_image_tag: (-> + facebook_id = @get('facebook_id') + return '' unless facebook_id + url = "http://graph.facebook.com/#{facebook_id}/picture?type=square" name = @get('name') - url = @get('facebook_image') new Handlebars.SafeString "\"#{name}\"" - ).property('facebook_image', 'name') + ).property('facebook_id', 'name') diff --git a/app/assets/javascripts/supplier/app/templates/section_table.emblem b/app/assets/javascripts/supplier/app/templates/section_table.emblem index 6222d79c..c1a20ea7 100644 --- a/app/assets/javascripts/supplier/app/templates/section_table.emblem +++ b/app/assets/javascripts/supplier/app/templates/section_table.emblem @@ -13,7 +13,7 @@ if table.active_list /.table-action-row a{action "editTable" table}: span.fa.fa-lg.fa-wrench each user in table.active_list.users - img src=user.facebook_image + span= user.facebook_image_tag if editmodedisabled .table-settings select diff --git a/app/assets/javascripts/supplier/foundation1/qsupplier.js.coffee.erb b/app/assets/javascripts/supplier/foundation1/qsupplier.js.coffee.erb index 81dd6e2f..0d17d994 100644 --- a/app/assets/javascripts/supplier/foundation1/qsupplier.js.coffee.erb +++ b/app/assets/javascripts/supplier/foundation1/qsupplier.js.coffee.erb @@ -3,10 +3,6 @@ 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) diff --git a/app/controllers/suppliers/lists_controller.rb b/app/controllers/suppliers/lists_controller.rb index 1ffd977e..c9bd2818 100644 --- a/app/controllers/suppliers/lists_controller.rb +++ b/app/controllers/suppliers/lists_controller.rb @@ -19,7 +19,7 @@ module Suppliers else @lists = List.for_supplier(current_supplier, page: params[:page], per_page: params[:per_page] || 25) end - @lists.include_relation(:table) + @lists.include_relation(:table, :users, orders: {product_orders: :product}) render json: @lists, each_serializer: SupplierListSerializer end diff --git a/app/serializers/order_serializer.rb b/app/serializers/order_serializer.rb index 6251afad..d329c94f 100644 --- a/app/serializers/order_serializer.rb +++ b/app/serializers/order_serializer.rb @@ -2,17 +2,5 @@ class OrderSerializer < Qwaiter::Serializer embed :ids, include: true attributes :state, :list_id, :section_id, :table_id #, :price - # todo, put this logic in Ember - #def product_orders - #@product_orders ||= object.product_orders.include_relation(:product) .map do |product_order| - #{product_name: product_order.product.name, id: product_order.id, quantity: product_order.quantity, price: product_order.price} - #end - #end - - # todo, put this logic in Ember - #def price - #product_orders.inject(0){|sum, po| sum + po[:quantity] * po[:price]}.round(2) - #end - has_many :product_orders end diff --git a/spec/acceptance/suppliers/section_view.feature b/spec/acceptance/suppliers/section_view.feature index 0c29e606..37054ad7 100644 --- a/spec/acceptance/suppliers/section_view.feature +++ b/spec/acceptance/suppliers/section_view.feature @@ -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 @broken + @javascript 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 @broken + @javascript 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 @broken + @javascript 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 diff --git a/spec/spec_helper.rb b/spec/spec_helper.rb index 7dc49656..bdb82984 100644 --- a/spec/spec_helper.rb +++ b/spec/spec_helper.rb @@ -18,7 +18,7 @@ Dir.glob("spec/acceptance_steps/**/*steps.rb") { |f| load f, true } I18n.locale =I18n.default_locale Devise.stretches = 1 Capybara.javascript_driver = :webkit -Capybara.default_wait_time = 4 # ember needs more time than the default of 2 +Capybara.default_wait_time = 6 # ember needs more time than the default of 2 #Capybara.javascript_driver = :selenium module FactoryAttributesFor