Merge branch 'upgrade/bundle' into 'master'

upgrade: bundle

Closes #13

See merge request !23

6 files changed, 127 insertions, 119 deletions

diff --git a/Gemfile.lock b/Gemfile.lock
index ca0cb63..e944e86 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -26,44 +26,44 @@ GEM
   remote: https://rubygems.org/
   specs:
     SyslogLogger (2.0)
-    actionmailer (4.2.7.1)
-      actionpack (= 4.2.7.1)
-      actionview (= 4.2.7.1)
-      activejob (= 4.2.7.1)
+    actionmailer (4.2.8)
+      actionpack (= 4.2.8)
+      actionview (= 4.2.8)
+      activejob (= 4.2.8)
       mail (~> 2.5, >= 2.5.4)
       rails-dom-testing (~> 1.0, >= 1.0.5)
-    actionpack (4.2.7.1)
-      actionview (= 4.2.7.1)
-      activesupport (= 4.2.7.1)
+    actionpack (4.2.8)
+      actionview (= 4.2.8)
+      activesupport (= 4.2.8)
       rack (~> 1.6)
       rack-test (~> 0.6.2)
       rails-dom-testing (~> 1.0, >= 1.0.5)
       rails-html-sanitizer (~> 1.0, >= 1.0.2)
-    actionview (4.2.7.1)
-      activesupport (= 4.2.7.1)
+    actionview (4.2.8)
+      activesupport (= 4.2.8)
       builder (~> 3.1)
       erubis (~> 2.7.0)
       rails-dom-testing (~> 1.0, >= 1.0.5)
-      rails-html-sanitizer (~> 1.0, >= 1.0.2)
-    activejob (4.2.7.1)
-      activesupport (= 4.2.7.1)
+      rails-html-sanitizer (~> 1.0, >= 1.0.3)
+    activejob (4.2.8)
+      activesupport (= 4.2.8)
       globalid (>= 0.3.0)
-    activemodel (4.2.7.1)
-      activesupport (= 4.2.7.1)
+    activemodel (4.2.8)
+      activesupport (= 4.2.8)
       builder (~> 3.1)
-    activerecord (4.2.7.1)
-      activemodel (= 4.2.7.1)
-      activesupport (= 4.2.7.1)
+    activerecord (4.2.8)
+      activemodel (= 4.2.8)
+      activesupport (= 4.2.8)
       arel (~> 6.0)
-    activesupport (4.2.7.1)
+    activesupport (4.2.8)
       i18n (~> 0.7)
-      json (~> 1.7, >= 1.7.7)
       minitest (~> 5.1)
       thread_safe (~> 0.3, >= 0.3.4)
       tzinfo (~> 1.1)
-    addressable (2.4.0)
-    arel (6.0.3)
-    autoprefixer-rails (6.4.0.2)
+    addressable (2.5.0)
+      public_suffix (~> 2.0, >= 2.0.2)
+    arel (6.0.4)
+    autoprefixer-rails (6.7.7)
       execjs
     better_errors (2.1.1)
       coderay (>= 1.0.0)
@@ -74,28 +74,28 @@ GEM
     bootstrap-sass (3.3.7)
       autoprefixer-rails (>= 5.2.1)
       sass (>= 3.3.4)
-    braintree (2.65.0)
+    braintree (2.72.0)
       builder (>= 2.0.0)
     buftok (0.2.0)
-    builder (3.2.2)
-    byebug (9.0.5)
-    capybara (2.7.1)
+    builder (3.2.3)
+    byebug (9.0.6)
+    capybara (2.12.1)
       addressable
       mime-types (>= 1.16)
       nokogiri (>= 1.3.3)
       rack (>= 1.0.0)
       rack-test (>= 0.5.4)
       xpath (~> 2.0)
-    client_side_validations (4.2.5)
+    client_side_validations (4.2.12)
       jquery-rails (>= 3.1.2, < 5.0.0)
-      js_regex (~> 1.0, >= 1.0.9)
+      js_regex (~> 1.0, >= 1.0.19)
       rails (>= 4.0.0, < 4.3.0)
-    client_side_validations-simple_form (3.2.4)
-      client_side_validations (~> 4.2.3)
-      simple_form (~> 3.2)
+    client_side_validations-simple_form (3.4.0)
+      client_side_validations (~> 4.2.12)
+      simple_form (~> 3.4)
     cliver (0.3.2)
     coderay (1.1.1)
-    concurrent-ruby (1.0.2)
+    concurrent-ruby (1.0.5)
     couchrest (2.0.0)
       httpclient (~> 2.8)
       mime-types (>= 1.15)
@@ -118,36 +118,36 @@ GEM
       multi_test (>= 0.1.2)
     cucumber-core (1.5.0)
       gherkin (~> 4.0)
-    cucumber-rails (1.4.4)
+    cucumber-rails (1.4.5)
       capybara (>= 1.1.2, < 3)
-      cucumber (>= 1.3.8, < 3)
+      cucumber (>= 1.3.8, < 4)
       mime-types (>= 1.16, < 4)
       nokogiri (~> 1.5)
       railties (>= 3, < 5.1)
     cucumber-wire (0.0.1)
     debug_inspector (0.0.2)
-    diff-lcs (1.2.5)
-    domain_name (0.5.20160615)
+    diff-lcs (1.3)
+    domain_name (0.5.20170223)
       unf (>= 0.0.5, < 1.0.0)
-    equalizer (0.0.10)
+    equalizer (0.0.11)
     erubis (2.7.0)
     execjs (2.7.0)
-    factory_girl (4.7.0)
+    factory_girl (4.8.0)
       activesupport (>= 3.0.0)
-    factory_girl_rails (4.7.0)
-      factory_girl (~> 4.7.0)
+    factory_girl_rails (4.8.0)
+      factory_girl (~> 4.8.0)
       railties (>= 3.0.0)
     fake_braintree (0.8.0)
       activesupport
       braintree (~> 2.32)
       capybara (>= 2.2.0)
       sinatra
-    faker (1.6.6)
+    faker (1.7.3)
       i18n (~> 0.5)
-    faraday (0.9.2)
+    faraday (0.11.0)
       multipart-post (>= 1.2, < 3)
-    ffi (1.9.14)
-    gherkin (4.0.0)
+    ffi (1.9.18)
+    gherkin (4.1.0)
     globalid (0.3.7)
       activesupport (>= 4.1.0)
     haml (4.0.7)
@@ -158,37 +158,45 @@ GEM
       haml (>= 4.0.6, < 5.0)
       html2haml (>= 1.0.1)
       railties (>= 4.0.1)
-    html2haml (2.0.0)
+    html2haml (2.1.0)
       erubis (~> 2.7.0)
-      haml (~> 4.0.0)
-      nokogiri (~> 1.6.0)
+      haml (~> 4.0)
+      nokogiri (>= 1.6.0)
       ruby_parser (~> 3.5)
-    http (1.0.4)
+    http (2.2.1)
       addressable (~> 2.3)
       http-cookie (~> 1.0)
       http-form_data (~> 1.0.1)
       http_parser.rb (~> 0.6.0)
-    http-cookie (1.0.2)
+    http-cookie (1.0.3)
       domain_name (~> 0.5)
     http-form_data (1.0.1)
-    http_accept_language (2.0.5)
+    http_accept_language (2.1.0)
     http_parser.rb (0.6.0)
-    httpclient (2.8.1)
-    i18n (0.7.0)
+    httpclient (2.8.3)
+    i18n (0.8.1)
     i18n-missing_translations (0.0.1)
-    jquery-rails (4.1.1)
+    jquery-rails (4.2.2)
       rails-dom-testing (>= 1, < 3)
       railties (>= 4.2.0)
       thor (>= 0.14, < 2.0)
-    js_regex (1.0.17)
-      regexp_parser (= 0.3.6)
-    json (1.8.3)
-    kaminari (0.17.0)
-      actionpack (>= 3.0.0)
-      activesupport (>= 3.0.0)
+    js_regex (1.2.1)
+      regexp_parser (>= 0.3.6, <= 0.4.2)
+    kaminari (1.0.1)
+      activesupport (>= 4.1.0)
+      kaminari-actionview (= 1.0.1)
+      kaminari-activerecord (= 1.0.1)
+      kaminari-core (= 1.0.1)
+    kaminari-actionview (1.0.1)
+      actionview
+      kaminari-core (= 1.0.1)
+    kaminari-activerecord (1.0.1)
+      activerecord
+      kaminari-core (= 1.0.1)
+    kaminari-core (1.0.1)
     launchy (2.4.3)
       addressable (~> 2.3)
-    libv8 (3.16.14.15)
+    libv8 (3.16.14.19-x86_64-linux)
     loofah (2.0.3)
       nokogiri (>= 1.5.9)
     mail (2.6.4)
@@ -201,21 +209,19 @@ GEM
       mime-types-data (~> 3.2015)
     mime-types-data (3.2016.0521)
     mini_portile2 (2.1.0)
-    minitest (5.9.0)
-    minitest-stub-const (0.5)
-    mocha (1.1.0)
+    minitest (5.10.1)
+    minitest-stub-const (0.6)
+    mocha (1.2.1)
       metaclass (~> 0.0.1)
     multi_json (1.12.1)
     multi_test (0.1.2)
     multipart-post (2.0.0)
     naught (1.1.0)
-    nokogiri (1.6.8)
+    nokogiri (1.7.0.1)
       mini_portile2 (~> 2.1.0)
-      pkg-config (~> 1.1.7)
-    phantomjs-binaries (2.1.1.0)
+    phantomjs-binaries (2.1.1.1)
       sys-uname (= 0.9.0)
-    pkg-config (1.1.7)
-    poltergeist (1.10.0)
+    poltergeist (1.13.0)
       capybara (~> 2.1)
       cliver (~> 0.3.1)
       websocket-driver (>= 0.2.0)
@@ -223,27 +229,28 @@ GEM
       coderay (~> 1.1.0)
       method_source (~> 0.8.1)
       slop (~> 3.4)
-    rack (1.6.4)
+    public_suffix (2.0.5)
+    rack (1.6.5)
     rack-protection (1.5.3)
       rack
     rack-test (0.6.3)
       rack (>= 1.0)
-    rails (4.2.7.1)
-      actionmailer (= 4.2.7.1)
-      actionpack (= 4.2.7.1)
-      actionview (= 4.2.7.1)
-      activejob (= 4.2.7.1)
-      activemodel (= 4.2.7.1)
-      activerecord (= 4.2.7.1)
-      activesupport (= 4.2.7.1)
+    rails (4.2.8)
+      actionmailer (= 4.2.8)
+      actionpack (= 4.2.8)
+      actionview (= 4.2.8)
+      activejob (= 4.2.8)
+      activemodel (= 4.2.8)
+      activerecord (= 4.2.8)
+      activesupport (= 4.2.8)
       bundler (>= 1.3.0, < 2.0)
-      railties (= 4.2.7.1)
+      railties (= 4.2.8)
       sprockets-rails
     rails-deprecated_sanitizer (1.0.3)
       activesupport (>= 4.2.0.alpha)
-    rails-dom-testing (1.0.7)
+    rails-dom-testing (1.0.8)
       activesupport (>= 4.2.0.beta, < 5.0)
-      nokogiri (~> 1.6.0)
+      nokogiri (~> 1.6)
       rails-deprecated_sanitizer (>= 1.0.1)
     rails-html-sanitizer (1.0.3)
       loofah (~> 2.0)
@@ -252,74 +259,73 @@ GEM
       railties (~> 4.0)
     rails_warden (0.5.8)
       warden (>= 1.0.0)
-    railties (4.2.7.1)
-      actionpack (= 4.2.7.1)
-      activesupport (= 4.2.7.1)
+    railties (4.2.8)
+      actionpack (= 4.2.8)
+      activesupport (= 4.2.8)
       rake (>= 0.8.7)
       thor (>= 0.18.1, < 2.0)
-    rake (11.2.2)
+    rake (12.0.0)
     rdiscount (2.2.0.1)
     ref (2.0.0)
-    regexp_parser (0.3.6)
-    responders (2.2.0)
+    regexp_parser (0.4.2)
+    responders (2.3.0)
       railties (>= 4.2.0, < 5.1)
     ruby-srp (0.2.1)
-    ruby_parser (3.8.2)
+    ruby_parser (3.8.4)
       sexp_processor (~> 4.1)
-    sass (3.4.22)
+    sass (3.4.23)
     sass-rails (5.0.6)
       railties (>= 4.0.0, < 6)
       sass (~> 3.1)
       sprockets (>= 2.8, < 4.0)
       sprockets-rails (>= 2.0, < 4.0)
       tilt (>= 1.1, < 3)
-    sexp_processor (4.7.0)
-    simple_form (3.2.1)
+    sexp_processor (4.8.0)
+    simple_form (3.4.0)
       actionpack (> 4, < 5.1)
       activemodel (> 4, < 5.1)
     simple_oauth (0.3.1)
-    sinatra (1.4.7)
+    sinatra (1.4.8)
       rack (~> 1.5)
       rack-protection (~> 1.4)
       tilt (>= 1.3, < 3)
     slop (3.6.0)
-    sprockets (3.7.0)
+    sprockets (3.7.1)
       concurrent-ruby (~> 1.0)
       rack (> 1, < 3)
-    sprockets-rails (3.1.1)
+    sprockets-rails (3.2.0)
       actionpack (>= 4.0)
       activesupport (>= 4.0)
       sprockets (>= 3.0.0)
     sys-uname (0.9.0)
       ffi (>= 1.0.0)
-    therubyracer (0.12.2)
-      libv8 (~> 3.16.14.0)
+    therubyracer (0.12.3)
+      libv8 (~> 3.16.14.15)
       ref
-    thor (0.19.1)
-    thread_safe (0.3.5)
-    tilt (2.0.5)
-    twitter (5.16.0)
-      addressable (~> 2.3)
+    thor (0.19.4)
+    thread_safe (0.3.6)
+    tilt (2.0.6)
+    twitter (6.1.0)
+      addressable (~> 2.5)
       buftok (~> 0.2.0)
-      equalizer (= 0.0.10)
-      faraday (~> 0.9.0)
-      http (~> 1.0)
+      equalizer (= 0.0.11)
+      faraday (~> 0.11.0)
+      http (~> 2.1)
       http_parser.rb (~> 0.6.0)
-      json (~> 1.8)
-      memoizable (~> 0.4.0)
-      naught (~> 1.0)
-      simple_oauth (~> 0.3.0)
+      memoizable (~> 0.4.2)
+      naught (~> 1.1)
+      simple_oauth (~> 0.3.1)
     tzinfo (1.2.2)
       thread_safe (~> 0.1)
-    uglifier (3.0.1)
+    uglifier (3.1.7)
       execjs (>= 0.3.0, < 3)
     unf (0.2.0.beta2)
     valid_email (0.0.13)
       activemodel
       mail (~> 2.6.1)
-    warden (1.2.6)
+    warden (1.2.7)
       rack (>= 1.0)
-    websocket-driver (0.6.4)
+    websocket-driver (0.6.5)
       websocket-extensions (>= 0.1.0)
     websocket-extensions (0.1.2)
     xpath (2.0.0)
@@ -374,4 +380,4 @@ DEPENDENCIES
   valid_email
 
 BUNDLED WITH
-   1.12.5
+   1.14.3
diff --git a/engines/billing/test/functional/subscriptions_controller_test.rb b/engines/billing/test/functional/subscriptions_controller_test.rb
index 1e98eff..592ffc3 100644
--- a/engines/billing/test/functional/subscriptions_controller_test.rb
+++ b/engines/billing/test/functional/subscriptions_controller_test.rb
@@ -53,13 +53,13 @@ class SubscriptionsControllerTest < ActionController::TestCase
 
  test "subscribe creates subscription" do
    user = find_record :user
-   user.expects(:save).returns(true)
    login user
    payment_methods = [stub(:token => 'user_token')]
    Braintree::Customer.any_instance.stubs(:payment_methods).returns(payment_methods)
-   user.expects(:save).returns(true)
 
+   user.expects(:update_attributes).returns(true).twice
    post :subscribe, :id => "1", :first_name => "Test", :last_name => "Testing", :company => "RGSoC", :email => "any@email.com", :phone => "555-888-1234"
+   user.validate
 
    assert assigns(:result).success?
    assert_not_nil flash[:success]
@@ -67,12 +67,13 @@ class SubscriptionsControllerTest < ActionController::TestCase
 
  test "unsubscribe cancels subscription" do
    user = find_record :user
-   user.expects(:save).returns(true)
    result = Braintree::Subscription.create(payment_method_token: 'user_token', plan_id: '1')
    user.subscription_id = result.subscription.id
    login user
 
+   user.expects(:update_attributes).returns(true)
    delete :unsubscribe, :id => "1"
+   user.validate
 
    assert assigns(:result).success?
    assert_not_nil flash[:success]
diff --git a/engines/support/test/unit/account_extension_test.rb b/engines/support/test/unit/account_extension_test.rb
index 0ecb1aa..1b97062 100644
--- a/engines/support/test/unit/account_extension_test.rb
+++ b/engines/support/test/unit/account_extension_test.rb
@@ -10,7 +10,7 @@ class AccountExtensionTest < ActiveSupport::TestCase
     t = FactoryGirl.create :ticket_with_creator
     u = t.created_by_user
     Account.new(u).destroy
-    assert_equal nil, Ticket.find(t.id)
+    assert_nil Ticket.find(t.id)
   end
 
 end
diff --git a/engines/support/test/unit/ticket_test.rb b/engines/support/test/unit/ticket_test.rb
index 373f06c..048704c 100644
--- a/engines/support/test/unit/ticket_test.rb
+++ b/engines/support/test/unit/ticket_test.rb
@@ -42,7 +42,7 @@ class TicketTest < ActiveSupport::TestCase
     t = FactoryGirl.create :ticket_with_creator
     u = t.created_by_user
     Ticket.destroy_all_from(u)
-    assert_equal nil, Ticket.find(t.id)
+    assert_nil Ticket.find(t.id)
   end
 =begin
 # TODO: do once have current_user stuff in order
diff --git a/test/unit/identity_test.rb b/test/unit/identity_test.rb
index e9173af..6836487 100644
--- a/test/unit/identity_test.rb
+++ b/test/unit/identity_test.rb
@@ -122,8 +122,8 @@ class IdentityTest < ActiveSupport::TestCase
     @id = Identity.for(@user)
     @id.orphan!
     assert_equal @user.email_address, @id.address
-    assert_equal nil, @id.destination
-    assert_equal nil, @id.user
+    assert_nil @id.destination
+    assert_nil @id.user
     assert @id.orphaned?
     assert @id.valid?
   end
diff --git a/test/unit/user_test.rb b/test/unit/user_test.rb
index e181765..ab7add0 100644
--- a/test/unit/user_test.rb
+++ b/test/unit/user_test.rb
@@ -83,7 +83,8 @@ class UserTest < ActiveSupport::TestCase
 
   test "user to hash includes id, login, valid and enabled" do
     hash = @user.to_hash
-    assert_equal @user.id, hash[:id]
+    assert_nil @user.id
+    assert_nil hash[:id]
     assert_equal @user.valid?, hash[:ok]
     assert_equal @user.login, hash[:login]
     assert_equal @user.enabled?, hash[:enabled]