parlement 0.4 → 0.5

data/test/unit/mail_test.rb

@@ -17,8 +17,7 @@ class MailTest < Test::Unit::TestCase
 		mailFile = TMail::Mail.parse(read_fixture('mail_ruby').to_s)
 		#print "mailFile envelope-to: ", mailFile["envelope-to"]
 		#puts
-		elt = Elt.new
-		elt.receive(mailFile)
+		Mail.receive(mailFile)
 
 		assert_equal (mailsCount + 2), Mail.count
 		assert_equal (eltsCount + 2), Elt.count
@@ -35,8 +34,7 @@ class MailTest < Test::Unit::TestCase
 		eltsCount = Elt.count
 
 		mailFile = TMail::Mail.parse(read_fixture('mail_rubyWithSubject').to_s)
-		elt = Elt.new
-		elt.receive(mailFile)
+		Mail.receive(mailFile)
 
 		assert_equal (mailsCount + 2), Mail.count
 		assert_equal (eltsCount + 2), Elt.count
@@ -52,8 +50,7 @@ class MailTest < Test::Unit::TestCase
 		eltsCount = Elt.count
 
 		mailFile = TMail::Mail.parse(read_fixture('mail_rubyWithAttachment').to_s)
-		elt = Elt.new
-		elt.receive(mailFile)
+		elt = Mail.receive(mailFile).elt
 
 		assert_equal (mailsCount + 2), Mail.count
 		# Just one file as an attachment
@@ -70,41 +67,37 @@ class MailTest < Test::Unit::TestCase
 	def test_receiveChild
 		ActionMailer::Base.deliveries = []
 
-		elt = Elt.new
 		mailFile = TMail::Mail.parse(read_fixture('mail_ruby').to_s)
-		elt.receive(mailFile)
+		Mail.receive(mailFile)
 
 		ActionMailer::Base.deliveries = []
 		mailsCount = Mail.count
 		eltsCount = Elt.count
 
 		mailFileChild = TMail::Mail.parse(read_fixture('mail_rubyChild').to_s)
-		elt = Elt.new
-		elt.receive(mailFileChild)
+		Mail.receive(mailFileChild)
 
 		assert_equal (mailsCount + 1), Mail.count
 		assert_equal (eltsCount + 1), Elt.count
 
 		assert_equal mailFileChild.subject, ActionMailer::Base.deliveries[0].subject
 		assert_equal mailFileChild.references, ActionMailer::Base.deliveries[0].references
-		assert_equal elt.created_on, ActionMailer::Base.deliveries[0].date
+		assert_equal mailFileChild.date, ActionMailer::Base.deliveries[0].date
 	end
 
 	# Not used, just make sure mails are entered chronologically
 	def est_receiveChildThenParent
 		ActionMailer::Base.deliveries = []
 
-		elt = Elt.new
 		mailFile = TMail::Mail.parse(read_fixture('mail_rubyChild').to_s)
-		elt.receive(mailFile)
+		elt = Mail.receive(mailFile).elt
 
 		ActionMailer::Base.deliveries = []
 		mailsCount = Mail.count
 		eltsCount = Elt.count
 
 		mailFileChild = TMail::Mail.parse(read_fixture('mail_ruby').to_s)
-		eltParent = Elt.new
-		eltParent.receive(mailFileChild)
+		eltParent = Mail.receive(mailFileChild).elt
 
 		assert_equal (mailsCount + 1), Mail.count
 		assert_equal (eltsCount + 1), Elt.count
@@ -116,8 +109,7 @@ class MailTest < Test::Unit::TestCase
 		ActionMailer::Base.deliveries = []
 
 		mailFile = TMail::Mail.parse(read_fixture('mail_ruby').to_s)
-		elt = Elt.new
-		elt.receive(mailFile)
+		Mail.receive(mailFile)
 
 		mailsCount = Mail.count
 		eltsCount = Elt.count
@@ -125,8 +117,7 @@ class MailTest < Test::Unit::TestCase
 
 		mail = ActionMailer::Base.deliveries[1]
 
-		elt = Elt.new
-		elt.receive(mail)
+		Mail.receive(mail)
 
 		assert_equal mailsCount, Mail.count
 		assert_equal eltsCount, Elt.count
@@ -137,8 +128,7 @@ class MailTest < Test::Unit::TestCase
 		ActionMailer::Base.deliveries = []
 
 		mailFile = TMail::Mail.parse(read_fixture('mail_ruby').to_s)
-		elt = Elt.new
-		elt.receive(mailFile)
+		Mail.receive(mailFile)
 
 		mailsCount = Mail.count
 		eltsCount = Elt.count
@@ -154,8 +144,7 @@ class MailTest < Test::Unit::TestCase
 		#print "new mail.message_Id: ", mail.message_id
 		#puts
 
-		elt = Elt.new
-		elt.receive(mail)
+		Mail.receive(mail)
 
 		assert_equal mailsCount, Mail.count
 		assert_equal eltsCount, Elt.count
@@ -171,8 +160,7 @@ class MailTest < Test::Unit::TestCase
 
 
 		mailFile = TMail::Mail.parse(read_fixture('mail_ruby').to_s)
-		elt = Elt.new
-		elt.receive(mailFile)
+		elt = Mail.receive(mailFile).elt
 
 		#print mailFile.to_yaml
 		#puts
@@ -180,11 +168,47 @@ class MailTest < Test::Unit::TestCase
 
 		#puts elt.body
 
-		#puts elt.body =~ /même/
 		assert elt.body =~ /même/
+	end
 
-		#mail = ActionMailer::Base.deliveries[1]
-		#puts mail.to_yaml
+	def test_receive_no_choice
+		ActionMailer::Base.deliveries = []
+
+		mailFile = TMail::Mail.parse(read_fixture('mail_ruby').to_s)
+		elt = Mail.receive(mailFile).elt
+		choicesCount = 0
+
+		elt.voters.reload
+		assert_equal choicesCount+1, elt.voters.size
+	end
+
+	def test_receive_choice
+		ActionMailer::Base.deliveries = []
+
+		mailFile = TMail::Mail.parse(read_fixture('mail_ruby').to_s)
+		elt = Mail.receive(mailFile).elt
+
+		eltChild = Mail.receive(TMail::Mail.parse(read_fixture('mail_rubyChild').to_s)).elt
+
+		eltChild.voters.reload
+		assert_equal 1, eltChild.voters.size
+
+		assert_equal 1, eltChild.result
+		assert_equal -1, elt.result
+	end
+
+	def test_receive_second_choice
+		elt = Mail.receive(TMail::Mail.parse(read_fixture('mail_ruby').to_s)).elt
+
+		eltChild = Mail.receive(TMail::Mail.parse(read_fixture('mail_rubyChild').to_s)).elt
+
+		eltChild2 = Mail.receive(TMail::Mail.parse(read_fixture('mail_rubyChild2').to_s)).elt
+
+		elt.choices.reload
+		elt.voters.reload
+		assert 1, elt.choices.size
+		assert_equal 1, eltChild2.result
+		assert_equal 1, elt.result
 	end
 end
 

data/test/unit/subscriber_test.rb

@@ -4,7 +4,7 @@ class SubscriberTest < Test::Unit::TestCase
   fixtures :people, :users, :elts, :mails, :attachments, :subscribers
 
   def setup
-		@elt = Elt.find('ROOT')
+		@elt = Elt.find('mail')
 		@person = Person.find('first')
   end
 
@@ -31,5 +31,12 @@ class SubscriberTest < Test::Unit::TestCase
 		@person.subscribed_elts.delete(@elt)
 		assert_equal (num - 1), @person.subscribed_elts.size
   end
+
+  def test_all_recipients
+		num = @elt.all_recipients.size
+		@elt.subscribers << Person.find('bob')
+		@elt.parent.subscribers << Person.find('bob2')
+		assert_equal (num + 2), @elt.all_recipients.size
+  end
 end
 

metadata

@@ -3,8 +3,8 @@ rubygems_version: 0.8.11
 specification_version: 1
 name: parlement
 version: !ruby/object:Gem::Version 
-  version: "0.4"
-date: 2006-04-17 00:00:00 +02:00
+  version: "0.5"
+date: 2006-05-20 00:00:00 +02:00
 summary: Trusted Direct Democracy on a forum
 require_paths: 
 - lib
@@ -54,6 +54,7 @@ files:
 - app/models/person.rb
 - app/models/mail.rb
 - app/models/elt.rb
+- app/models/choice.rb
 - app/models/mail_notify.rb
 - app/models/user_notify.rb
 - app/views/layouts
@@ -94,8 +95,10 @@ files:
 - config/environments/user_environment.rb
 - db/schema.sql
 - db/schema.rb
+- db/migrate
 - db/ROOT
 - db/development_structure.sql
+- db/migrate/001_create_choices.rb
 - db/ROOT/perso
 - db/ROOT/parlement.txt
 - db/ROOT/perso.txt
@@ -109,10 +112,13 @@ files:
 - db/ROOT/parlement/news.txt
 - db/ROOT/parlement/top-politics.txt
 - db/ROOT/parlement/ddRing.txt
+- db/ROOT/parlement/our-constitution.txt
 - db/ROOT/parlement/security/anonymity.txt
 - db/ROOT/parlement/news/release0.1.txt
 - db/ROOT/parlement/news/release0.2.txt
 - db/ROOT/parlement/news/release0.3.txt
+- db/ROOT/parlement/news/release0.4.txt
+- db/ROOT/parlement/news/release0.5.txt
 - lib/localization.rb
 - lib/tasks
 - lib/data_import.rb
@@ -171,10 +177,12 @@ files:
 - test/fixtures/mail
 - test/fixtures/subscribers.yml
 - test/fixtures/mail_notify
+- test/fixtures/choices.yml
 - test/fixtures/mail/mail_ruby
 - test/fixtures/mail/mail_rubyWithSubject
 - test/fixtures/mail/mail_rubyWithAttachment
 - test/fixtures/mail/mail_rubyChild
+- test/fixtures/mail/mail_rubyChild2
 - test/functional/subscriber_controller_test.rb
 - test/functional/account_controller_test.rb
 - test/functional/person_controller_test.rb
@@ -190,6 +198,7 @@ files:
 - test/unit/attachment_test.rb
 - test/unit/mail_notify_test.rb
 - test/unit/subscriber_test.rb
+- test/unit/choice_test.rb
 - vendor/plugins
 - vendor/plugins/login_engine
 - vendor/plugins/engines
@@ -335,6 +344,7 @@ test_files:
 - test/unit/attachment_test.rb
 - test/unit/mail_notify_test.rb
 - test/unit/subscriber_test.rb
+- test/unit/choice_test.rb
 rdoc_options: []
 
 extra_rdoc_files: []