Sped up specs, fixed env
This commit is contained in:
parent
122bbf0cd2
commit
895742824d
4 changed files with 5 additions and 6 deletions
|
|
@ -43,6 +43,7 @@ class User < Person
|
||||||
end
|
end
|
||||||
|
|
||||||
def generate_key
|
def generate_key
|
||||||
|
puts "Generating key"
|
||||||
ctx = GPGME::Ctx.new
|
ctx = GPGME::Ctx.new
|
||||||
paramstring = "<GnupgKeyParms format=\"internal\">
|
paramstring = "<GnupgKeyParms format=\"internal\">
|
||||||
Key-Type: DSA
|
Key-Type: DSA
|
||||||
|
|
|
||||||
|
|
@ -4,5 +4,5 @@ Haml::Template.options[:format] = :html5
|
||||||
# Initialize the rails application
|
# Initialize the rails application
|
||||||
Diaspora::Application.initialize!
|
Diaspora::Application.initialize!
|
||||||
|
|
||||||
ENV['GNUPGHOME'] = File.expand_path("../../gpg-#{Rails.env}/", __FILE__)
|
ENV['GNUPGHOME'] = File.expand_path("../../gpg/diaspora-#{Rails.env}/", __FILE__)
|
||||||
GPGME::check_version({})
|
GPGME::check_version({})
|
||||||
|
|
|
||||||
|
|
@ -30,11 +30,6 @@ RSpec.configure do |config|
|
||||||
config.after(:each) do
|
config.after(:each) do
|
||||||
DatabaseCleaner.clean
|
DatabaseCleaner.clean
|
||||||
end
|
end
|
||||||
config.after(:suite) do
|
|
||||||
ctx = GPGME::Ctx.new
|
|
||||||
keys = ctx.keys
|
|
||||||
keys.each{|k| ctx.delete_key(k, true)}
|
|
||||||
end
|
|
||||||
end
|
end
|
||||||
def stub_sockets_controller
|
def stub_sockets_controller
|
||||||
mock_sockets_controller = mock('sockets mock')
|
mock_sockets_controller = mock('sockets mock')
|
||||||
|
|
|
||||||
|
|
@ -2,6 +2,9 @@ require File.dirname(__FILE__) + '/spec_helper'
|
||||||
|
|
||||||
describe 'user encryption' do
|
describe 'user encryption' do
|
||||||
before :all do
|
before :all do
|
||||||
|
ctx = GPGME::Ctx.new
|
||||||
|
keys = ctx.keys
|
||||||
|
keys.each{|k| ctx.delete_key(k, true)}
|
||||||
@u = User.new
|
@u = User.new
|
||||||
@u.email = "george@aol.com"
|
@u.email = "george@aol.com"
|
||||||
@u.password = "bluepin7"
|
@u.password = "bluepin7"
|
||||||
|
|
|
||||||
Loading…
Reference in a new issue