From afe7f9d2fc5c005445b1bde97d0f1f87f8389ba6 Mon Sep 17 00:00:00 2001 From: Benjamin ter Kuile Date: Sun, 13 Jan 2013 12:53:45 +0100 Subject: [PATCH] upgrade rails and allow blank iens profile --- Gemfile | 4 +- Gemfile.lock | 104 +++++++++--------- app/models/supplier.rb | 2 +- .../supplier_main_board_spec.rb_spec.rb | 10 +- 4 files changed, 58 insertions(+), 62 deletions(-) diff --git a/Gemfile b/Gemfile index ae832ad1..5bec0134 100644 --- a/Gemfile +++ b/Gemfile @@ -1,6 +1,6 @@ source 'https://rubygems.org' -gem 'rails', '3.2.9' +gem 'rails', '3.2.11' gem 'rack-cors', :require => 'rack/cors' # Bundle edge Rails instead: @@ -49,7 +49,7 @@ gem 'kaminari-bootstrap' # gem 'jbuilder' group :development do gem 'pry' - gem 'pry-remote' + #gem 'pry-remote' gem 'rspec-rails' gem 'guard-rspec' gem 'quiet_assets' diff --git a/Gemfile.lock b/Gemfile.lock index 3d81aa9b..d1ccea4b 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -19,12 +19,12 @@ GIT GEM remote: https://rubygems.org/ specs: - actionmailer (3.2.9) - actionpack (= 3.2.9) + actionmailer (3.2.11) + actionpack (= 3.2.11) mail (~> 2.4.4) - actionpack (3.2.9) - activemodel (= 3.2.9) - activesupport (= 3.2.9) + actionpack (3.2.11) + activemodel (= 3.2.11) + activesupport (= 3.2.11) builder (~> 3.0.0) erubis (~> 2.7.0) journey (~> 1.0.4) @@ -32,27 +32,27 @@ GEM rack-cache (~> 1.2) rack-test (~> 0.6.1) sprockets (~> 2.2.1) - activemodel (3.2.9) - activesupport (= 3.2.9) + activemodel (3.2.11) + activesupport (= 3.2.11) builder (~> 3.0.0) - activerecord (3.2.9) - activemodel (= 3.2.9) - activesupport (= 3.2.9) + activerecord (3.2.11) + activemodel (= 3.2.11) + activesupport (= 3.2.11) arel (~> 3.0.2) tzinfo (~> 0.3.29) - activeresource (3.2.9) - activemodel (= 3.2.9) - activesupport (= 3.2.9) - activesupport (3.2.9) + activeresource (3.2.11) + activemodel (= 3.2.11) + activesupport (= 3.2.11) + activesupport (3.2.11) i18n (~> 0.6) multi_json (~> 1.0) addressable (2.3.2) arel (3.0.2) bcrypt-ruby (3.0.1) - bootstrap-sass (2.2.1.1) + bootstrap-sass (2.2.2.0) sass (~> 3.2) builder (3.0.4) - capybara (2.0.1) + capybara (2.0.2) mime-types (>= 1.16) nokogiri (>= 1.3.3) rack (>= 1.0.0) @@ -61,7 +61,7 @@ GEM xpath (~> 1.0.0) childprocess (0.3.6) ffi (~> 1.0, >= 1.0.6) - chunky_png (1.2.6) + chunky_png (1.2.7) coderay (1.0.8) coffee-rails (3.2.2) coffee-script (>= 2.2.0) @@ -101,14 +101,14 @@ GEM factory_girl_rails (4.1.0) factory_girl (~> 4.1.0) railties (>= 3.0.0) - ffi (1.1.5) + ffi (1.3.1) fssm (0.2.9) - guard (1.5.4) - listen (>= 0.4.2) + guard (1.6.1) + listen (>= 0.6.0) lumberjack (>= 1.0.2) pry (>= 0.9.10) thor (>= 0.14.6) - guard-rspec (2.3.0) + guard-rspec (2.3.3) guard (>= 1.1) rspec (~> 2.11) haml (3.1.7) @@ -133,7 +133,7 @@ GEM libwebsocket (0.1.7.1) addressable websocket - listen (0.6.0) + listen (0.7.2) lumberjack (1.0.2) mail (2.4.4) i18n (>= 0.4.0) @@ -145,19 +145,16 @@ GEM subexec (~> 0.2.1) multi_json (1.5.0) mustache (0.99.4) - nokogiri (1.5.5) + nokogiri (1.5.6) orm_adapter (0.0.7) polyglot (0.3.3) pry (0.9.10) coderay (~> 1.0.5) method_source (~> 0.8) slop (~> 3.3.1) - pry-remote (0.1.6) - pry (~> 0.9) - slop (~> 3.0) quiet_assets (1.0.1) railties (~> 3.1) - rack (1.4.1) + rack (1.4.3) rack-cache (1.2) rack (>= 0.4) rack-cors (0.2.7) @@ -166,23 +163,23 @@ GEM rack rack-test (0.6.2) rack (>= 1.0) - rails (3.2.9) - actionmailer (= 3.2.9) - actionpack (= 3.2.9) - activerecord (= 3.2.9) - activeresource (= 3.2.9) - activesupport (= 3.2.9) + rails (3.2.11) + actionmailer (= 3.2.11) + actionpack (= 3.2.11) + activerecord (= 3.2.11) + activeresource (= 3.2.11) + activesupport (= 3.2.11) bundler (~> 1.0) - railties (= 3.2.9) - railties (3.2.9) - actionpack (= 3.2.9) - activesupport (= 3.2.9) + railties (= 3.2.11) + railties (3.2.11) + actionpack (= 3.2.11) + activesupport (= 3.2.11) rack-ssl (~> 1.3.2) rake (>= 0.8.7) rdoc (~> 3.4) thor (>= 0.14.6, < 2.0) - rake (10.0.2) - rb-fsevent (0.9.2) + rake (10.0.3) + rb-fsevent (0.9.3) rdoc (3.12) json (~> 1.4) rest-client (1.6.7) @@ -192,11 +189,11 @@ GEM rspec-core (~> 2.12.0) rspec-expectations (~> 2.12.0) rspec-mocks (~> 2.12.0) - rspec-core (2.12.1) - rspec-expectations (2.12.0) + rspec-core (2.12.2) + rspec-expectations (2.12.1) diff-lcs (~> 1.1.3) - rspec-mocks (2.12.0) - rspec-rails (2.12.0) + rspec-mocks (2.12.1) + rspec-rails (2.12.2) actionpack (>= 3.0) activesupport (>= 3.0) railties (>= 3.0) @@ -205,12 +202,12 @@ GEM rspec-mocks (~> 2.12.0) ruby_gntp (0.3.4) rubyzip (0.9.9) - sass (3.2.3) + sass (3.2.5) sass-rails (3.2.5) railties (~> 3.2.0) sass (>= 3.1.10) tilt (~> 1.3) - selenium-webdriver (2.26.0) + selenium-webdriver (2.27.2) childprocess (>= 0.2.5) libwebsocket (~> 0.1.3) multi_json (~> 1.0) @@ -218,14 +215,14 @@ GEM simple_form (2.0.4) actionpack (~> 3.0) activemodel (~> 3.0) - slim (1.3.4) + slim (1.3.6) temple (~> 0.5.5) tilt (~> 1.3.3) - slim-rails (1.0.3) - actionpack (~> 3.0) - activesupport (~> 3.0) - railties (~> 3.0) - slim (~> 1.0) + slim-rails (1.1.0) + actionpack (>= 3.0, < 4.1) + activesupport (>= 3.0, < 4.1) + railties (>= 3.0, < 4.1) + slim (~> 1.3) slop (3.3.3) sprockets (2.2.2) hike (~> 1.2) @@ -252,7 +249,7 @@ GEM multi_json (~> 1.0, >= 1.0.2) warden (1.1.1) rack (>= 1.0) - websocket (1.0.4) + websocket (1.0.6) xpath (1.0.0) nokogiri (~> 1.3) @@ -275,10 +272,9 @@ DEPENDENCIES mini_magick mustache pry - pry-remote quiet_assets rack-cors - rails (= 3.2.9) + rails (= 3.2.11) rb-fsevent rqrcode rspec-rails diff --git a/app/models/supplier.rb b/app/models/supplier.rb index 6f56a510..9acd84c8 100644 --- a/app/models/supplier.rb +++ b/app/models/supplier.rb @@ -34,7 +34,7 @@ class Supplier view :by_email, key: :email validates :name, presence: true - validates :iens_profile, numericality: true + validates :iens_profile, numericality: {allow_blank: true} def location=(val) lat, lng = val.strip.split(/[ ,]+/).map(&:to_f) diff --git a/spec/acceptance/suppliers/supplier_main_board_spec.rb_spec.rb b/spec/acceptance/suppliers/supplier_main_board_spec.rb_spec.rb index 77c8fe1a..a68249f6 100644 --- a/spec/acceptance/suppliers/supplier_main_board_spec.rb_spec.rb +++ b/spec/acceptance/suppliers/supplier_main_board_spec.rb_spec.rb @@ -1,9 +1,9 @@ require 'acceptance/acceptance_helper' feature 'Supplier main board spec.rb', %q{ - In order to manage active list and orders + In order to manage active lists and orders As a supplier - I want to have control over list and orders from the main activity panel + I want to have control over lists and orders from the main activity panel } do background do CouchPotato.couchrest_database.recreate! @@ -16,7 +16,7 @@ feature 'Supplier main board spec.rb', %q{ @list = create :list, supplier: @supplier, table: @table, user_ids: [@user.id] end - context "using javascript", js: true do + context "having javascript activated", js: true do scenario 'the active list should be present and contained in row having its id' do create_active_list @@ -25,7 +25,7 @@ feature 'Supplier main board spec.rb', %q{ page.should have_selector "#list-row-#{@list.id}" end - scenario 'order is added to the list before visiting the page' do + scenario 'an order is added to the list before visiting the page' do create_active_list login_supplier_as 'supplier@qwaiter.com' product = create :product, supplier: @supplier @@ -35,7 +35,7 @@ feature 'Supplier main board spec.rb', %q{ page.should have_selector ".of-list-#{@list.id}" end - scenario 'order is added to the list after visiting the page' do + scenario 'an order is added to the list after visiting the page' do create_active_list login_supplier_as 'supplier@qwaiter.com' product = create :product, supplier: @supplier