summaryrefslogtreecommitdiff
path: root/users/test
diff options
context:
space:
mode:
authorAzul <azul@leap.se>2013-08-30 10:14:22 +0200
committerAzul <azul@leap.se>2013-09-03 08:54:25 +0200
commite2a3daa9ae3f3570aca0dc22b70d87252e599d7a (patch)
tree05c25e47765d838c78d895bf3e1b94645f5a6a1a /users/test
parentc17edbc069c6dcfc3dd20d8cdfb5922032769a5f (diff)
don't leave id records behind when unit testing
Diffstat (limited to 'users/test')
-rw-r--r--users/test/unit/identity_test.rb7
-rw-r--r--users/test/unit/user_test.rb2
2 files changed, 4 insertions, 5 deletions
diff --git a/users/test/unit/identity_test.rb b/users/test/unit/identity_test.rb
index 472bc52..fa88315 100644
--- a/users/test/unit/identity_test.rb
+++ b/users/test/unit/identity_test.rb
@@ -7,9 +7,6 @@ class IdentityTest < ActiveSupport::TestCase
@user = find_record :user
end
- teardown do
- end
-
test "initial identity for a user" do
id = Identity.for(@user)
assert_equal @user.email_address, id.address
@@ -36,7 +33,6 @@ class IdentityTest < ActiveSupport::TestCase
assert_equal LocalEmail.new(alias_name), id.address
assert_equal Email.new(forward_address), id.destination
assert_equal @user, id.user
- id.save
end
test "prevents duplicates" do
@@ -44,6 +40,7 @@ class IdentityTest < ActiveSupport::TestCase
dup = Identity.build_for @user, address: alias_name, destination: forward_address
assert !dup.valid?
assert_equal ["This alias already exists"], dup.errors[:base]
+ id.destroy
end
test "validates availability" do
@@ -52,6 +49,7 @@ class IdentityTest < ActiveSupport::TestCase
taken = Identity.build_for other_user, address: alias_name
assert !taken.valid?
assert_equal ["This email has already been taken"], taken.errors[:base]
+ id.destroy
end
test "setting and getting pgp key" do
@@ -69,6 +67,7 @@ class IdentityTest < ActiveSupport::TestCase
assert result = view.rows.first
assert_equal id.address, result["key"]
assert_equal id.keys[:pgp], result["value"]
+ id.destroy
end
def alias_name
diff --git a/users/test/unit/user_test.rb b/users/test/unit/user_test.rb
index 8efb0bd..c797623 100644
--- a/users/test/unit/user_test.rb
+++ b/users/test/unit/user_test.rb
@@ -50,8 +50,8 @@ class UserTest < ActiveSupport::TestCase
other_user = FactoryGirl.create :user
id = Identity.create_for other_user, address: @user.login
assert !@user.valid?
- other_user.destroy
id.destroy
+ other_user.destroy
end
test "deprecated public key api still works" do