expresspigeon-ruby 0.1.0 → 0.1.1

data/spec/campaigns_spec.rb

@@ -6,55 +6,55 @@ describe 'campaigns integration test' do
   include PigeonSpecHelper
 
   it 'should return more than 0 campaign ids' do
-    res = PIGEON.campaigns.all
+    res = ExpressPigeon::API.campaigns.all
     res.class.should == Array
     res.size.should > 0
   end
 
   it 'cannot send with missing parameters' do
-    res = PIGEON.campaigns.send(:template_id => 15233, :name => 'API Test campaign',
-                                :from_name => 'Igor Polevoy', :reply_to => 'igor@polevoy.org',
-                                :subject => 'API test', :google_analytics => true)
+    res = ExpressPigeon::API.campaigns.send(:template_id => 15233, :name => 'API Test campaign',
+                                          :from_name => 'Igor Polevoy', :reply_to => 'igor@polevoy.org',
+                                          :subject => 'API test', :google_analytics => true)
     validate_response res, 400, 'error', /required parameters: list_id, template_id, name, from_name, reply_to, subject, google_analytics/
   end
 
   it 'cannot send with bad reply_to' do
-    res = PIGEON.campaigns.send(:list_id => -1, :template_id => -1, :name => 'My Campaign', :from_name => 'John', :reply_to => 'j',
-                                :subject => 'Hi', :google_analytics => false)
+    res = ExpressPigeon::API.campaigns.send(:list_id => -1, :template_id => -1, :name => 'My Campaign', :from_name => 'John', :reply_to => 'j',
+                                          :subject => 'Hi', :google_analytics => false)
     validate_response res, 400, 'error', /reply_to should be valid email address/
   end
 
   it 'cannot send with non-existing template' do
-    res = PIGEON.campaigns.send(:list_id => -1, :template_id => -1, :name => 'My Campaign', :from_name => 'John',
-                                :reply_to => 'j@j.j',
-                                :subject => 'Hi', :google_analytics => false)
+    res = ExpressPigeon::API.campaigns.send(:list_id => -1, :template_id => -1, :name => 'My Campaign', :from_name => 'John',
+                                          :reply_to => 'j@j.j',
+                                          :subject => 'Hi', :google_analytics => false)
     validate_response res, 400, 'error', /template=-1 is not found/
   end
 
   it 'cannot send to non-existing list' do
-    res = PIGEON.campaigns.send(:list_id => -1, :template_id => TEMPLATE_ID, :name => 'My Campaign', :from_name => 'John',
-                                :reply_to => 'j@j.j',
-                                :subject => 'Hi', :google_analytics => false)
+    res = ExpressPigeon::API.campaigns.send(:list_id => -1, :template_id => TEMPLATE_ID, :name => 'My Campaign', :from_name => 'John',
+                                          :reply_to => 'j@j.j',
+                                          :subject => 'Hi', :google_analytics => false)
     validate_response res, 400, 'error', /list=-1 is not found/
   end
 
   it 'cannot send to disabled list' do
-    res = PIGEON.campaigns.send(:list_id => LIST_ID, :template_id => TEMPLATE_ID, :name => 'My Campaign', :from_name => 'John',
-                                :reply_to => 'j@j.j',
-                                :subject => 'Hi', :google_analytics => false)
+    res = ExpressPigeon::API.campaigns.send(:list_id => LIST_ID, :template_id => TEMPLATE_ID, :name => 'My Campaign', :from_name => 'John',
+                                          :reply_to => 'j@j.j',
+                                          :subject => 'Hi', :google_analytics => false)
     validate_response res, 400, 'error', /list=#{DISABLED_LIST} is disabled/
   end
 
   it 'should create new list, add contact and send successful campaign' do
 
-    list_resp = PIGEON.lists.create('My list', 'John', API_USER)
+    list_resp = ExpressPigeon::API.lists.create('My list', 'John', API_USER)
     list_id = list_resp.list.id
-    PIGEON.contacts.upsert(list_id, {:email => API_USER})
-    resp = PIGEON.campaigns.send(:list_id => list_id, :template_id => TEMPLATE_ID, :name => 'My Campaign', :from_name => 'John',
-                                 :reply_to => API_USER,
-                                 :subject => 'Hi', :google_analytics => false)
+    ExpressPigeon::API.contacts.upsert(list_id, {:email => API_USER})
+    resp = ExpressPigeon::API.campaigns.send(:list_id => list_id, :template_id => TEMPLATE_ID, :name => 'My Campaign', :from_name => 'John',
+                                           :reply_to => API_USER,
+                                           :subject => 'Hi', :google_analytics => false)
     validate_response resp, 200, 'success', /new campaign created successfully/
-    report = PIGEON.campaigns.report(resp.campaign_id)
+    report = ExpressPigeon::API.campaigns.report(resp.campaign_id)
     (report.delivered == 0 or report.delivered == 1).should be_true
     report.clicked.should eq 0
     report.opened.should eq 0
@@ -62,45 +62,45 @@ describe 'campaigns integration test' do
     (report.in_transit == 0 or report.in_transit == 1).should be_true
     report.unsubscribed.should eq 0
     report.bounced.should eq 0
-    bounced = PIGEON.campaigns.bounced(resp.campaign_id)
-    unsubscribed = PIGEON.campaigns.unsubscribed(resp.campaign_id)
-    spam = PIGEON.campaigns.spam(resp.campaign_id)
+    bounced = ExpressPigeon::API.campaigns.bounced(resp.campaign_id)
+    unsubscribed = ExpressPigeon::API.campaigns.unsubscribed(resp.campaign_id)
+    spam = ExpressPigeon::API.campaigns.spam(resp.campaign_id)
 
     bounced.size.should eq 0
     unsubscribed.size.should eq 0
     spam.size.should eq 0
 
-    resp = PIGEON.contacts.delete(API_USER)
+    resp = ExpressPigeon::API.contacts.delete(API_USER)
     validate_response resp, 200, 'success', /contact=non@non.non deleted successfully/
 
-    resp = PIGEON.contacts.find_by_email(API_USER)
+    resp = ExpressPigeon::API.contacts.find_by_email(API_USER)
     validate_response resp, 404, 'error', /contact=non@non.non not found/
 
-    resp = PIGEON.lists.delete(list_id)
+    resp = ExpressPigeon::API.lists.delete(list_id)
     validate_response resp, 200, 'success', /deleted successfully/
   end
 
 
   it 'cannot send campaign if scheduling with bad date' do
 
-    list_resp = PIGEON.lists.create "My list", "John", API_USER
-    resp = PIGEON.campaigns.schedule :list_id => list_resp.list.id, :template_id => TEMPLATE_ID, :name => 'My Campaign',
+    list_resp = ExpressPigeon::API.lists.create "My list", "John", API_USER
+    resp = ExpressPigeon::API.campaigns.schedule :list_id => list_resp.list.id, :template_id => TEMPLATE_ID, :name => 'My Campaign',
 
-                                     :from_name => 'John',
-                                     :reply_to => API_USER, :subject => 'Hi',
-                                     :google_analytics => false, :schedule_for => "2013-05-28"
+                                               :from_name => 'John',
+                                               :reply_to => API_USER, :subject => 'Hi',
+                                               :google_analytics => false, :schedule_for => "2013-05-28"
 
     validate_response resp, 400, 'error', /schedule_for is not in ISO date format, example: 2013-05-28T17:19:50.779/
-    resp = PIGEON.lists.delete(list_resp.list.id)
+    resp = ExpressPigeon::API.lists.delete(list_resp.list.id)
     validate_response resp, 200, 'success', /deleted successfully/
   end
 
   it 'should not schedule campaign with date in the past' do
-    list_resp = PIGEON.lists.create('My list', 'John', API_USER)
-    resp = PIGEON.campaigns.schedule :list_id => list_resp.list.id, :template_id => TEMPLATE_ID, :name => 'My Campaign',
-                                     :from_name => 'John',
-                                     :reply_to => API_USER, :subject => 'Hi',
-                                     :google_analytics => false, :schedule_for => '2010-05-28T17:19:50.779+0300'
+    list_resp = ExpressPigeon::API.lists.create('My list', 'John', API_USER)
+    resp = ExpressPigeon::API.campaigns.schedule :list_id => list_resp.list.id, :template_id => TEMPLATE_ID, :name => 'My Campaign',
+                                               :from_name => 'John',
+                                               :reply_to => API_USER, :subject => 'Hi',
+                                               :google_analytics => false, :schedule_for => '2010-05-28T17:19:50.779+0300'
 
     validate_response resp, 400, 'error', /schedule_for should be in the future/
   end
@@ -108,26 +108,48 @@ describe 'campaigns integration test' do
 
 
   it 'should delete scheduled campaign' do
-    list_resp = PIGEON.lists.create('My list', 'John', API_USER)
-    resp = PIGEON.campaigns.schedule :list_id => list_resp.list.id, :template_id => TEMPLATE_ID, :name => 'My Campaign',
-                                     :from_name => 'John',
-                                     :reply_to => API_USER, :subject => 'Hi',
-                                     :google_analytics => false, :schedule_for => '2030-05-28T17:19:50.779+0300'
+    list_resp = ExpressPigeon::API.lists.create('My list', 'John', API_USER)
+    resp = ExpressPigeon::API.campaigns.schedule :list_id => list_resp.list.id, :template_id => TEMPLATE_ID, :name => 'My Campaign',
+                                               :from_name => 'John',
+                                               :reply_to => API_USER, :subject => 'Hi',
+                                               :google_analytics => false, :schedule_for => '2030-05-28T17:19:50.779+0300'
 
     validate_response resp, 200, 'success', /new campaign created successfully/
     campaign_id = resp.campaign_id
-    resp = PIGEON.campaigns.delete campaign_id
+    resp = ExpressPigeon::API.campaigns.delete campaign_id
     resp.message.should eq "campaign #{campaign_id} was deleted"
   end
 
 
   # This test uses account ep.api.tester@expresspigeon.com and expects two specific campaign there.
   it 'should list campaigns from account' do
-    campaigns = PIGEON.campaigns.all
+    campaigns = ExpressPigeon::API.campaigns.all
     campaigns.size.should eq 4
-    campaigns = PIGEON.campaigns.all from_id: 53853
+    campaigns = ExpressPigeon::API.campaigns.all from_id: 53853
     campaigns.size.should eq 3
   end
 
+
+  it 'should get opened from campaign' do
+    opened = ExpressPigeon::API.campaigns.opened 441663
+
+    puts opened
+
+  end
+
+  it 'should get clicked from campaign' do
+    clicked = ExpressPigeon::API.campaigns.clicked 441663
+
+    puts clicked
+
+  end
+
+  it 'should get unsubs from campaign' do
+    unsubscribed = ExpressPigeon::API.campaigns.unsubscribed 441663
+
+    puts unsubscribed
+
+  end
+
 end
 

data/spec/contacts_spec.rb

@@ -6,24 +6,24 @@ describe 'contacts integration test' do
   include PigeonSpecHelper
 
   it 'should not create contact without contact data' do
-    resp = PIGEON.contacts.upsert(-1, {})
+    resp = ExpressPigeon::API.contacts.upsert(-1, {})
     validate_response resp, 400, 'error', /email is required/
   end
 
   it 'should not create contact without email' do
-    resp = PIGEON.contacts.upsert -1, :email => '', :first_name => 'Marylin', :last_name => 'Monroe'
+    resp = ExpressPigeon::API.contacts.upsert -1, :email => '', :first_name => 'Marylin', :last_name => 'Monroe'
     validate_response resp, 400, 'error', /email is required/
   end
 
   it 'should not add contact with too many custom fields' do
     custom_fields = {}
     (1..25).each { |n| custom_fields["custom_field_#{n}"] = n }
-    resp = PIGEON.contacts.upsert -1,  :email => "mary@e.e", :custom_fields => custom_fields
+    resp = ExpressPigeon::API.contacts.upsert -1, :email => "mary@e.e", :custom_fields => custom_fields
     validate_response resp, 400, 'error', /You cannot create more than 20 custom fields. Use one of the 'custom_fields'./
   end
 
   it 'should not create new contact without list_id' do
-    resp = PIGEON.contacts.upsert '', :email => 'ee@e.e', :first_name => 'Marylin', :last_name => 'Monroe'
+    resp = ExpressPigeon::API.contacts.upsert '', :email => 'ee@e.e', :first_name => 'Marylin', :last_name => 'Monroe'
     # TODO: this is a pretty crappy message from API https://redmine.expresspigeon.com/issues/5479
     validate_response resp, 400, 'error', /failed to convert: '' to Long/
   end
@@ -34,21 +34,21 @@ describe 'contacts integration test' do
   # end
 
   it 'cannot upsert into non-existent_list' do
-    resp = PIGEON.contacts.upsert -123, :email => "e@e.e"
+    resp = ExpressPigeon::API.contacts.upsert -123, :email => "e@e.e"
     # TODO: uncomment after: https://redmine.expresspigeon.com/issues/5478
     validate_response resp, 404, 'error', /contact=e@e.e not found/
   end
 
   it 'creates list with contacts' do
-    list_response = PIGEON.lists.create 'My List', 'John Doe', 'john@doe.com'
+    list_response = ExpressPigeon::API.lists.create 'My List', 'John Doe', 'john@doe.com'
     list_id = list_response.list.id
-    resp = PIGEON.contacts.upsert list_id, email: "mary@e.e",
-                                  :custom_fields => {:custom_field_1 => "custom_value_1", }
+    resp = ExpressPigeon::API.contacts.upsert list_id, email: "mary@e.e",
+                                            :custom_fields => {:custom_field_1 => "custom_value_1", }
     validate_response resp, 200, 'success', /contacts created\/updated successfully/
 
-    resp = PIGEON.contacts.find_by_email "mary@e.e"
+    resp = ExpressPigeon::API.contacts.find_by_email "mary@e.e"
 
-    PIGEON.lists.delete(list_id)
+    ExpressPigeon::API.lists.delete(list_id)
 
     resp.custom_fields.custom_field_1 eq "custom_value_1"
     resp.email.should eq 'mary@e.e'
@@ -56,16 +56,16 @@ describe 'contacts integration test' do
   end
 
   it 'creates list non-existent custom field' do
-    list_response = PIGEON.lists.create 'My List', 'John Doe', 'a@a.a'
+    list_response = ExpressPigeon::API.lists.create 'My List', 'John Doe', 'a@a.a'
     list_id = list_response.list.id
-    resp = PIGEON.contacts.upsert(list_id, {:email => "mary@e.e", :custom_fields => {:c => "c", }})
-    PIGEON.lists.delete(list_id)
+    resp = ExpressPigeon::API.contacts.upsert(list_id, {:email => "mary@e.e", :custom_fields => {:c => "c", }})
+    ExpressPigeon::API.lists.delete(list_id)
     validate_response resp, 200, 'success', nil
   end
 
   it 'cannot export contacts from list without list_id' do
     content = ''
-    PIGEON.lists.csv "-1" do |c|
+    ExpressPigeon::API.lists.csv "-1" do |c|
       content << c
     end
     resp = JSON.parse(content)
@@ -76,7 +76,7 @@ describe 'contacts integration test' do
 
   it 'should get contacts from suppressed list' do
     content =''
-    PIGEON.lists.csv "suppress_list" do |c|
+    ExpressPigeon::API.lists.csv "suppress_list" do |c|
       content += c
     end
     resp = content.split /\n/
@@ -87,13 +87,13 @@ describe 'contacts integration test' do
   end
 
   it 'should get single contact' do
-    resp = PIGEON.contacts.find_by_email 'suppressed@e.e'
+    resp = ExpressPigeon::API.contacts.find_by_email 'suppressed@e.e'
     # TODO: have these on account before checking.
     # resp.email.should eq 'suppressed@e.e'
   end
 
   it 'should not find non existent contact' do
-    resp = PIGEON.contacts.find_by_email 'a@a.a'
+    resp = ExpressPigeon::API.contacts.find_by_email 'a@a.a'
     # TODO: have these on account before checking.
 
     # validate_response resp, 404, 'error', /contact=a@a.a not found/
@@ -103,56 +103,56 @@ describe 'contacts integration test' do
 
 
 
-    list_response = PIGEON.lists.create('My List', 'John Doe', "a@a.a")
+    list_response = ExpressPigeon::API.lists.create('My List', 'John Doe', "a@a.a")
 
     # PIGEON.contacts.find_by_email("mary@e.e").last_name.should eq 'Doe'
 
-    resp = PIGEON.contacts.upsert list_response.list.id,
-                                  :email => 'mary@e.e', :first_name => 'Mary', :last_name => 'Johns'
+    resp = ExpressPigeon::API.contacts.upsert list_response.list.id,
+                                            :email => 'mary@e.e', :first_name => 'Mary', :last_name => 'Johns'
     validate_response resp, 200, 'success', /contacts created\/updated successfully/
-    PIGEON.contacts.find_by_email("mary@e.e").last_name.should eq 'Johns'
-    PIGEON.lists.delete list_response.list.id
+    ExpressPigeon::API.contacts.find_by_email("mary@e.e").last_name.should eq 'Johns'
+    ExpressPigeon::API.lists.delete list_response.list.id
   end
 
   it 'cannot delete contact with non-existent email' do
-    res = PIGEON.contacts.delete("g@g.g")
+    res = ExpressPigeon::API.contacts.delete("g@g.g")
     validate_response res, 404, 'error', /contact=g@g.g not found/
   end
 
   it 'should not delete suppressed contact' do
-    res = PIGEON.contacts.delete("suppressed@e.e")
+    res = ExpressPigeon::API.contacts.delete("suppressed@e.e")
 
     # TODO: add this to the account at setup.
     # validate_response res, 400, 'error', /contact=suppressed@e.e is in suppress list/
   end
 
   it 'should delete single contact from all lists' do
-    list_response = PIGEON.lists.create 'My List', 'Jane Doe', 'a@a.a'
-    PIGEON.contacts.upsert list_response.list.id, :email => 'mary@e.e'
-    res = PIGEON.contacts.delete 'mary@e.e'
+    list_response = ExpressPigeon::API.lists.create 'My List', 'Jane Doe', 'a@a.a'
+    ExpressPigeon::API.contacts.upsert list_response.list.id, :email => 'mary@e.e'
+    res = ExpressPigeon::API.contacts.delete 'mary@e.e'
     validate_response res, 200, 'success', /contact=mary@e.e deleted successfully/
-    PIGEON.lists.delete list_response.list.id
+    ExpressPigeon::API.lists.delete list_response.list.id
   end
 
   it 'deletes single contact from single list' do
-    list_response = PIGEON.lists.create 'My List', 'John D.', 'a@a.a'
-    list_response_2 = PIGEON.lists.create('My List2', "Jane D.", 'a@a.a')
-    PIGEON.contacts.upsert(list_response.list.id, {:email => 'mary@e.e'})
-    PIGEON.contacts.upsert(list_response_2.list.id, {:email => 'mary@e.e'})
+    list_response = ExpressPigeon::API.lists.create 'My List', 'John D.', 'a@a.a'
+    list_response_2 = ExpressPigeon::API.lists.create('My List2', "Jane D.", 'a@a.a')
+    ExpressPigeon::API.contacts.upsert(list_response.list.id, {:email => 'mary@e.e'})
+    ExpressPigeon::API.contacts.upsert(list_response_2.list.id, {:email => 'mary@e.e'})
 
-    res = PIGEON.contacts.delete 'mary@e.e', list_response.list.id
+    res = ExpressPigeon::API.contacts.delete 'mary@e.e', list_response.list.id
 
     validate_response res, 200, 'success', /contact=mary@e.e deleted successfully/
 
     contacts_exported = ''
-    PIGEON.lists.csv list_response.list.id do |c|
+    ExpressPigeon::API.lists.csv list_response.list.id do |c|
       contacts_exported << c
     end
     contacts_exported = contacts_exported.split /\n/
     contacts_exported.size.should eq 1
 
     contacts_exported_2 = ''
-    PIGEON.lists.csv list_response_2.list.id do |c|
+    ExpressPigeon::API.lists.csv list_response_2.list.id do |c|
       contacts_exported_2 << c
     end
 
@@ -160,9 +160,9 @@ describe 'contacts integration test' do
     contacts_exported_2.size.should eq 2
     contacts_exported_2[1].should =~ /"mary@e.e"/
 
-    PIGEON.lists.delete(list_response.list.id)
-    PIGEON.lists.delete(list_response_2.list.id)
-    PIGEON.contacts.delete('mary@e.e')
+    ExpressPigeon::API.lists.delete(list_response.list.id)
+    ExpressPigeon::API.lists.delete(list_response_2.list.id)
+    ExpressPigeon::API.contacts.delete('mary@e.e')
   end
 end
 

data/spec/lists_spec.rb

@@ -6,39 +6,39 @@ describe 'lists integration test' do
   include PigeonSpecHelper
 
   it 'test_create_and_delete_new_list(self):' do
-    contact_list = PIGEON.lists.create 'Active customers', 'Bob', 'bob@acmetools.com'
+    contact_list = ExpressPigeon::API.lists.create 'Active customers', 'Bob', 'bob@acmetools.com'
     validate_response contact_list, 200, 'success', /list=#{contact_list.list.id} created\/updated successfully/
     contact_list.list.name.should eq "Active customers"
     contact_list.list.from_name.should eq "Bob"
     contact_list.list.reply_to.should eq "bob@acmetools.com"
     contact_list.list.contact_count.should eq 0
-    res = PIGEON.lists.delete contact_list.list.id
+    res = ExpressPigeon::API.lists.delete contact_list.list.id
     validate_response res, 200, 'success', /list=#{contact_list.list.id} deleted successfully/
   end
 
   it 'should update existing list' do
-    contact_list = PIGEON.lists.create("Update", "Bob", "bob@acmetools.com")
-    res = PIGEON.lists.update contact_list.list.id, :name => 'Updated Name', :from_name => 'Bob', :reply_to => 'Frank@zappa.com'
+    contact_list = ExpressPigeon::API.lists.create("Update", "Bob", "bob@acmetools.com")
+    res = ExpressPigeon::API.lists.update contact_list.list.id, :name => 'Updated Name', :from_name => 'Bob', :reply_to => 'Frank@zappa.com'
     validate_response res, 200, 'success', /list=#{res.list.id} created\/updated successfully/
     res.list.name.should eq "Updated Name"
     res.list.from_name.should eq 'Bob'
-    res = PIGEON.lists.delete(contact_list.list.id)
+    res = ExpressPigeon::API.lists.delete(contact_list.list.id)
     validate_response res, 200, 'success', /list=#{contact_list.list.id} deleted successfully/
   end
 
 
   it 'should upload contacts as CSV file' do
     list_name = "Upload_#{Kernel.rand(9999).to_s}"
-    list_resp = PIGEON.lists.create(list_name, 'Bob', 'bob@acmetools.com')
+    list_resp = ExpressPigeon::API.lists.create(list_name, 'Bob', 'bob@acmetools.com')
     begin
-      resp = PIGEON.lists.upload(list_resp.list.id, 'spec/resources/upload.csv')
+      resp = ExpressPigeon::API.lists.upload(list_resp.list.id, 'spec/resources/upload.csv')
       validate_response resp, 200, 'success', /file uploaded successfully/
-      res = PIGEON.contacts.find_by_email 'x@x.x'
+      res = ExpressPigeon::API.contacts.find_by_email 'x@x.x'
       res.lists[0]['id'].should eq list_resp.list.id
     ensure
-      res = PIGEON.lists.delete(list_resp.list.id)
+      res = ExpressPigeon::API.lists.delete(list_resp.list.id)
       validate_response res, 200, 'success', /list=#{list_resp.list.id} deleted successfully/
-      PIGEON.contacts.find_by_email('x@x.x').message.should eq 'contact=x@x.x not found'
+      ExpressPigeon::API.contacts.find_by_email('x@x.x').message.should eq 'contact=x@x.x not found'
     end
   end
 
@@ -72,11 +72,19 @@ describe 'lists integration test' do
 #        self.assertEqual(res.code, 404)
 #        self.assertEqual(res.message, "list=-1 not found")
 #
-#    def test_upload_status_without_upload_id(self):
-#        res = self.api.lists.upload_status("")
-#        self.assertEqual(res.code, 400)
-#        self.assertEqual(res.status, "error")
-#        self.assertEqual(res.message, "you must provide upload id")
+  it 'should check upload status' do
+    list_response = ExpressPigeon::API.lists.create("My List", "a@a.a", "a@a.a")
+    resp = ExpressPigeon::API.lists.upload(list_response.list.id, 'spec/resources/upload.csv')
+
+    sleep 20
+
+    begin
+      puts ExpressPigeon::API.lists.upload_status list_response.list.id
+    ensure
+      ExpressPigeon::API.lists.delete list_response.list.id
+    end
+
+  end
 #
 #    def test_enabled_list_removal(self):
 #        list_resp = self.api.lists.create("My list", "John", os.environ['EXPRESSPIGEON_API_USER'])
@@ -102,22 +110,32 @@ describe 'lists integration test' do
 #                         "could not delete list={0}, it has dependent subscriptions and/or scheduled campaigns".format(
 #                             list_resp.list.id))
 #
-#    def test_export_csv(self):
-#        list_response = self.api.lists.create("My List", "a@a.a", "a@a.a")
-#        self.api.contacts.upsert(list_response.list.id, {"email": "mary@a.a"})
-#
-#        res = self.api.lists.csv(list_response.list.id).split("\n")
-#        self.assertEquals(len(res), 2)
-#        headers = '"Email", "First name", "Last name", "City", "Phone", "Company", "Title", "Address 1", "Address 2", ' \
-#                  '"State", "Zip", "Country", "Date of birth", "custom_field_1", "custom_field_10", "custom_field_11", ' \
-#                  '"custom_field_12", "custom_field_13", "custom_field_18", "custom_field_19", "custom_field_2", ' \
-#                  '"custom_field_20", "custom_field_21", "custom_field_22", "custom_field_23", "custom_field_24", ' \
-#                  '"custom_field_3", "custom_field_4", "custom_field_5", "custom_field_6", "custom_field_7", ' \
-#                  '"custom_field_8", "custom_field_9"'
-#        self.assertEquals(res[0], headers)
-#        self.assertEquals(res[1], '"mary@a.a",,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,')
-#
-#        self.api.lists.delete(list_response.list.id)
-#        self.api.contacts.delete("mary@a.a")
+   it 'should upload and download CSV' do
+     list_response = ExpressPigeon::API.lists.create("My List", "a@a.a", "a@a.a")
+     resp = ExpressPigeon::API.lists.upload(list_response.list.id, 'spec/resources/upload.csv')
+     res = ExpressPigeon::API.lists.csv(list_response.list.id)
+     ExpressPigeon::API.lists.delete list_response.list.id
+
+     count = 0
+     res.each_line do |line|
+      count = count + 1
+     end
+     count.should eq 4
+
+
+
+     # self.assertEquals(len(res), 2)
+       # headers = '"Email", "First name", "Last name", "City", "Phone", "Company", "Title", "Address 1", "Address 2", ' \
+       #           '"State", "Zip", "Country", "Date of birth", "custom_field_1", "custom_field_10", "custom_field_11", ' \
+       #           '"custom_field_12", "custom_field_13", "custom_field_18", "custom_field_19", "custom_field_2", ' \
+       #           '"custom_field_20", "custom_field_21", "custom_field_22", "custom_field_23", "custom_field_24", ' \
+       #           '"custom_field_3", "custom_field_4", "custom_field_5", "custom_field_6", "custom_field_7", ' \
+       #           '"custom_field_8", "custom_field_9"'
+       # self.assertEquals(res[0], headers)
+       # self.assertEquals(res[1], '"mary@a.a",,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,')
+       #
+       # self.api.lists.delete(list_response.list.id)
+       # self.api.contacts.delete("mary@a.a")
+     end
 
 end