Added functional tests for the graph controller -- assert that valid images return...

[selectricity-live] / app / apis / selectricity_api.rb

diff --git a/app/apis/selectricity_api.rb b/app/apis/selectricity_api.rb
index b1210c6e861eb9b02c1d8a7693ee5885241d5986..9c95369d9a798917ee68babb9d2f578c0a6b3b04 100644 (file)
--- a/app/apis/selectricity_api.rb
+++ b/app/apis/selectricity_api.rb
@@ -7,6 +7,7 @@ class ElectionStruct < ActionWebService::Struct
 end
 class VoteInfo < ActionWebService::Struct
   member :voter_id, :int
 end
 class VoteInfo < ActionWebService::Struct
   member :voter_id, :int

+  member :voter_session_id, :string

   member :voter_ipaddress, :string
   member :vote_time, :int
   member :vote, [:int]
   member :voter_ipaddress, :string
   member :vote_time, :int
   member :vote, [:int]


@@ -18,12 +19,10 @@ class VoteResultStruct < ActionWebService::Struct
   member :condorcet_winners, [:int]
   member :ssd_winners, [:int]
   member :borda_winners, [:int]
   member :condorcet_winners, [:int]
   member :ssd_winners, [:int]
   member :borda_winners, [:int]

-  member :errors, [:string]

 end
 class CandidateMap < ActionWebService::Struct
   member :candidate_ids, [:int]
   member :candidate_names, [:string]
 end
 class CandidateMap < ActionWebService::Struct
   member :candidate_ids, [:int]
   member :candidate_names, [:string]

-  member :errors, [:string]

 end
 class SelectricityAPI < ActionWebService::API::Base
   api_method :cast_quickvote, :expects => [:string, :int, [[:int]]], :returns => [:string]
 end
 class SelectricityAPI < ActionWebService::API::Base
   api_method :cast_quickvote, :expects => [:string, :int, [[:int]]], :returns => [:string]