Merge remote-tracking branch 'origin/develop'

Conflicts:
	app/assets/javascripts/srp
	test/nagios/soledad_sync.py
	test/nagios/webapp_login.py

1 files changed, 0 insertions, 38 deletions

diff --git a/billing/test/unit/customer_test.rb b/billing/test/unit/customer_test.rb
deleted file mode 100644
index 6156f87..0000000
--- a/billing/test/unit/customer_test.rb
+++ /dev/null
@@ -1,38 +0,0 @@
-require 'test_helper'
-
-class CustomerTest < ActiveSupport::TestCase
-  include StubRecordHelper
-
-  setup do
-    @user = find_record :user
-    @customer = FactoryGirl.build(:customer, user: @user)
-  end
-
-  test "test set of attributes should be valid" do
-    @customer.valid?
-    assert_equal Hash.new, @customer.errors.messages
-  end
-
-  test "customer belongs to user" do
-    assert_equal User, @customer.user.class
-  end
-
-  test "user validation" do
-    @customer.user = nil
-    assert !@customer.valid?
-  end
-
-  test "has no payment info" do
-    assert !@customer.braintree_customer_id
-    assert !@customer.has_payment_info?
-  end
-
-  test "with no braintree data" do
-    assert_equal @customer, @customer.with_braintree_data!
-  end
-
-  test "without default credit card" do
-    assert_nil @customer.default_credit_card
-  end
-
-end