From 603fc151201dc68c4c35427b70649bb71a401d4d Mon Sep 17 00:00:00 2001
From: maxwell <maxwell@joindiaspora.com>
Date: Sat, 10 Jul 2010 23:54:25 -0700
Subject: [PATCH] MS IZ added the env setting line to factories
---
config/environments/test.rb | 3 ++-
gpg/diaspora-test/random_seed | Bin 600 -> 600 bytes
spec/factories.rb | 6 ++++--
3 files changed, 6 insertions(+), 3 deletions(-)
diff --git a/config/environments/test.rb b/config/environments/test.rb
index 7f40c884b4..2611a12faa 100644
--- a/config/environments/test.rb
+++ b/config/environments/test.rb
@@ -26,7 +26,8 @@ Diaspora::Application.configure do
config.action_mailer.delivery_method = :test
config.threadsafe!
-
+ ENV['GNUPGHOME'] = File.expand_path("../../gpg/diaspora-#{Rails.env}/", __FILE__)
+ GPGME::check_version({})
# Use SQL instead of Active Record's schema dumper when creating the test database.
# This is necessary if your schema can't be completely dumped by the schema dumper,
# like if you have constraints or database-specific column types
diff --git a/gpg/diaspora-test/random_seed b/gpg/diaspora-test/random_seed
index 3662498f087ad7b8c9e7148f3cbd05527aa1322a..ea68b1833981eaceb24bbce9dcf30c074fe5ca53 100644
GIT binary patch
literal 600
zcmV-e0;m0e)=SNAHlz}hz==YZ3g(Sg;2=#tutCdQt73!Hla-x1wECdJ!lRJ6br%Al
zn^c&Y`%Vk-wI=a;J(8T(7cAk?^3<|8<*rj|e3$GJa3yMg#URKSEsigA6jIgBNys)D
zs%MGGhZum{9<S&%xH=kAx9j}@gHha9Q8&v2Z7dyV@pg$b%}`xD5Na+O{59leRr-nB
zx8M3n&HoPZu%XZS(rBSAteJEr%uw3i+~lWu5<+l#v410+vCkN+k(JQ3N~o++Y=>>F
zzG6k+bQhv@CL6dyyh1)En<XIHw>d~^Y(u7qi?(<)!>stm$YZke%VxfCSq##mN6mE2
z^hI5dunNNP{D*}Eh>@MbWk}dtq`1g0VirC_({KeZzsKCr#(#H?@eh!HQ{+;IQGU8m
zCwrT2V55^nnT~^qH)q8`j}}<4FZrk%pxVcUjf?G8R~kQ~*c^|R%(*Ara8o1~`maY6
z6HN37+p>pkf*Qb^_nqkO-9%9cFsDl59KLP_8l=^j@K2mlJjDKgnK`92iI>Xhr&OFF
zc}2!D;e~7By}B#7oVwzmGlb^GFN(?^JJAfQ4-bi5!<dW!7XM_%J|S1NxZdUU&zNoJ
zXXBefjh=?hjQ{)tn|D*0H6C=P1H=0j(Zt)@pa*6?1HD*fY0qbBcYX8AAPrpm&Xicx
z{QHJpAg-TG-w~q#;2e<i@UQ%kf-G4W_nqLzE>nK=Fg{lJwdTI^FN8!s*WIl$O1x5b
m4BZ9AmT#z|7~vrosXH72rWFSO0}94}Ix6o4iNLz<GczE)jWY!R
literal 600
zcmV-e0;l~)hAhB1g<tgD-lWFR6(nszpm-;96wAJr#d(=H6Mq*sLBhB<0ZWlpKS9sH
zPj=EfE5{!8Ih-Lg#TITKU^aHtj>_<%i~YBl>bey+a6{KbYx*<iOX7^rWrh%zXY=*9
zIqT?}I*G;yS{3wlC9^-ssOx|xB5TvK>!ym0_v-<n=)|lS)}r&FF1IhS(1tF;5@Zp<
z-Aq$cuXdt%Y)lpl(2tW0VSjRSewoZT!*6SYQpa3?8=E%kRB+U+*|-!72y>A0=-__a
zD4VpV9J6DiHr!0hujp#g9cE#R59Do!h+G$&u$_oc4%n9tntZ%#Zv>>WNaf>|9w>Iw
zbovO9nv$p0tB4};pqzC8Kt82~#IHo)$`?s;Z|?j&)RCe_8f_2ApCi!H_D4GVDWb`$
z_}FMt^j>>oU(T6EjMC$GnU-ErWl(s$$RtDA|5tnGowpfu5>%I-kx1DKBM47zE_$0v
zSIR^!ru42gw)X9Z51g;Rrqp68_OJg!orB~rr(QB3BcTPsjOU{+DCoMkd7DaGJVSFB
zfW-XgN-+s303=X#&Yshfp#Xul4FPRe@TRUl@brBa^(jHbb8`ejyGWrdr!u1t=^|1J
za0L>zSZ{b4leLBI`kmSg70l$61_J@kMMcQgh3m_1m2^I#SF^S(HEa%XxWRwE(MB2b
z0tbX2YJ95k+UC~<TG*HzKIqYaf!i%v#t^6=yDM)nYHl36`qjx8qyOl<*Dw;Nv6tGD
m(F!3c0J4431|y~Q|8%F0`^UkKt*Ni}B70Dre<~pHyBHQ_VJ;W|
diff --git a/spec/factories.rb b/spec/factories.rb
index 90eddd3ba1..912cb7d907 100644
--- a/spec/factories.rb
+++ b/spec/factories.rb
@@ -1,7 +1,9 @@
#For Guidance
#http://github.com/thoughtbot/factory_girl
# http://railscasts.com/episodes/158-factories-not-fixtures
-
+#This inclsion, because gpg-agent(not needed) is never run and hence never sets any env. variables on a MAC
+ENV['GNUPGHOME'] = File.expand_path("../../gpg/diaspora-#{Rails.env}/", __FILE__)
+GPGME::check_version({})
Factory.define :profile do |p|
p.first_name "Robert"
@@ -21,7 +23,7 @@ Factory.define :user do |u|
u.password "bluepin7"
u.password_confirmation "bluepin7"
u.url "www.example.com/"
- u.key_fingerprint GPGME.list_keys(nil, true).first.subkeys.first.fingerprint
+ u.key_fingerprint GPGME.list_keys(nil, true).first.subkeys.first.fingerprint
u.profile Profile.new( :first_name => "Bob", :last_name => "Smith" )
end
--
GitLab