summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorelijah <elijah@riseup.net>2015-09-22 12:03:38 -0700
committerelijah <elijah@riseup.net>2015-09-22 12:03:38 -0700
commitea71f09ee23dbc080dd29adf2c3b8fa61f848c22 (patch)
tree419db918544e034481608b5ac5bbd65b115f6355
parent3e8771097ab7392560fdf07a85c011c23098fd1e (diff)
parentbdefeafe150123b7f186dda13366e7a1d7dc53ed (diff)
Merge branch 'bugfix/find_by_nil' of https://github.com/azul/leap_web into develop
-rw-r--r--Gemfile.lock14
-rw-r--r--test/unit/user_test.rb5
2 files changed, 10 insertions, 9 deletions
diff --git a/Gemfile.lock b/Gemfile.lock
index a185562..42dea53 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -77,7 +77,7 @@ GEM
mime-types (~> 1.15)
multi_json (~> 1.0)
rest-client (~> 1.6.1)
- couchrest_model (2.0.0)
+ couchrest_model (2.0.1)
activemodel (>= 3.0)
couchrest (~> 1.1.3)
mime-types (>= 1.15)
@@ -139,7 +139,7 @@ GEM
jquery-rails (3.1.2)
railties (>= 3.0, < 5.0)
thor (>= 0.14, < 2.0)
- json (1.8.1)
+ json (1.8.3)
kaminari (0.13.0)
actionpack (>= 3.0.0)
activesupport (>= 3.0.0)
@@ -156,7 +156,7 @@ GEM
minitest-stub-const (0.2)
mocha (0.13.3)
metaclass (~> 0.0.1)
- multi_json (1.10.1)
+ multi_json (1.11.2)
multi_test (0.1.1)
nokogiri (1.6.5)
mini_portile (~> 0.6.0)
@@ -204,9 +204,8 @@ GEM
rdoc (3.12.2)
json (~> 1.4)
ref (2.0.0)
- rest-client (1.6.8)
+ rest-client (1.6.9)
mime-types (~> 1.16)
- rdoc (>= 2.4.2)
ruby-srp (0.2.1)
sass (3.4.9)
sass-rails (3.2.6)
@@ -239,7 +238,7 @@ GEM
treetop (1.4.15)
polyglot
polyglot (>= 0.3.1)
- tzinfo (0.3.42)
+ tzinfo (0.3.44)
uglifier (1.2.7)
execjs (>= 0.3.0)
multi_json (~> 1.3)
@@ -297,6 +296,3 @@ DEPENDENCIES
thin
uglifier (~> 1.2.7)
valid_email
-
-BUNDLED WITH
- 1.10.6
diff --git a/test/unit/user_test.rb b/test/unit/user_test.rb
index b3c831b..c301923 100644
--- a/test/unit/user_test.rb
+++ b/test/unit/user_test.rb
@@ -7,6 +7,11 @@ class UserTest < ActiveSupport::TestCase
@user = FactoryGirl.build(:user)
end
+ test "don't find a user with login nil" do
+ @user.save
+ assert_nil User.find_by_login(nil)
+ end
+
test "design docs in database are authorative" do
assert !User.design_doc.auto_update,
"Automatic update of design docs should be disabled"