sem4r 0.1.2 → 0.1.3

data/spec/helpers/fixtures_bulk_mutate_job.rb

@@ -0,0 +1,48 @@
+# -*- coding: utf-8 -*-
+# -------------------------------------------------------------------
+# Copyright (c) 2009-2010 Sem4r sem4ruby@gmail.com
+#
+# Permission is hereby granted, free of charge, to any person obtaining
+# a copy of this software and associated documentation files (the
+# "Software"), to deal in the Software without restriction, including
+# without limitation the rights to use, copy, modify, merge, publish,
+# distribute, sublicense, and/or sell copies of the Software, and to
+# permit persons to whom the Software is furnished to do so, subject to
+# the following conditions:
+#
+# The above copyright notice and this permission notice shall be
+# included in all copies or substantial portions of the Software.
+#
+# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+# EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+# MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+# NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
+# LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
+# OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
+# WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+# -------------------------------------------------------------------
+
+module FixtureBulkMutateJob
+
+  def fixtures_bulk_mutate_job
+    @dump_interceptor.reset_and_stop
+    account = @adwords.account
+
+    campaign, ad_group = template_campaign_and_ad_group(account)
+
+    intercept("mutate-add_job") {
+      job = template_bulk_mutate_job(campaign, ad_group)
+      job.num_parts = 2 # create a pending job, so it is possible to see in list
+      result_job = account.job_mutate(JobOperation.add(job))
+      puts result_job.to_s
+    }
+
+    intercept("get-list_job") {
+      account.p_jobs
+    }
+
+    @dump_interceptor.intercept_to("report_definition", "getReportFields-{type}.xml")
+    @dump_interceptor.stop
+  end
+
+end

data/spec/helpers/fixtures_geo_location.rb

@@ -0,0 +1,45 @@
+# -*- coding: utf-8 -*-
+# -------------------------------------------------------------------
+# Copyright (c) 2009-2010 Sem4r sem4ruby@gmail.com
+#
+# Permission is hereby granted, free of charge, to any person obtaining
+# a copy of this software and associated documentation files (the
+# "Software"), to deal in the Software without restriction, including
+# without limitation the rights to use, copy, modify, merge, publish,
+# distribute, sublicense, and/or sell copies of the Software, and to
+# permit persons to whom the Software is furnished to do so, subject to
+# the following conditions:
+#
+# The above copyright notice and this permission notice shall be
+# included in all copies or substantial portions of the Software.
+#
+# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+# EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+# MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+# NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
+# LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
+# OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
+# WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+# -------------------------------------------------------------------
+
+module FixtureGeoLocation
+
+  def fixtures_geo_location
+    @dump_interceptor.reset_and_stop
+
+    intercept("get") {
+      selector = GeoLocationSelector.new
+      selector.address do
+        address "Via Nazionale, 10"
+        city "Rome"
+        country "IT"
+      end
+      selector.address do
+        city "Pisa"
+        country "IT"
+      end
+      @adwords.account.geo_location(selector)
+    }
+  end
+
+end

data/{lib/sem4r/campaign_criterion/campaign_criterion_service.rb → spec/helpers/fixtures_info.rb}

@@ -1,3 +1,4 @@
+# -*- coding: utf-8 -*-
 # -------------------------------------------------------------------
 # Copyright (c) 2009-2010 Sem4r sem4ruby@gmail.com
 #
@@ -21,10 +22,13 @@
 # WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 # -------------------------------------------------------------------
 
-module Sem4r
-  class CampaignCriterionService
-    def initialize
-    
-    end
+module FixtureInfo
+
+  def fixtures_info
+    @dump_interceptor.reset_and_stop
+    intercept("get") {
+      @adwords.account.year_unit_cost(InfoSelector::UNIT_COUNT)
+    }
   end
-end
+
+end

data/spec/helpers/fixtures_report_definition.rb

@@ -0,0 +1,65 @@
+# -*- coding: utf-8 -*-
+# -------------------------------------------------------------------
+# Copyright (c) 2009-2010 Sem4r sem4ruby@gmail.com
+#
+# Permission is hereby granted, free of charge, to any person obtaining
+# a copy of this software and associated documentation files (the
+# "Software"), to deal in the Software without restriction, including
+# without limitation the rights to use, copy, modify, merge, publish,
+# distribute, sublicense, and/or sell copies of the Software, and to
+# permit persons to whom the Software is furnished to do so, subject to
+# the following conditions:
+#
+# The above copyright notice and this permission notice shall be
+# included in all copies or substantial portions of the Software.
+#
+# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+# EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+# MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+# NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
+# LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
+# OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
+# WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+# -------------------------------------------------------------------
+
+module FixtureReportDefinition
+
+  def fixtures_report_definition
+    account = @adwords.account
+
+    @dump_interceptor.reset_and_start
+
+    @dump_interceptor.intercept_to("report_definition", "getReportFields")
+    account.report_fields(ReportDefinition::KEYWORDS_PERFORMANCE_REPORT)
+
+    @dump_interceptor.stop
+    account.report_definition_delete_all
+
+
+    @dump_interceptor.start
+    @dump_interceptor.intercept_to("report_definition", "mutate-add-report")
+
+    rd = account.report_definition do
+      name       "Keywords performance report #1290336379254"
+      type       "KEYWORDS_PERFORMANCE_REPORT"
+      date_range "LAST_WEEK"
+      format     "CSV"
+
+      field "AdGroupId"
+      field "Id"
+      field "KeywordText"
+      field "KeywordMatchType"
+      field "Impressions"
+      field "Clicks"
+      field "Cost"
+    end
+    rd.save
+    puts "created report id #{rd.id}"
+
+    @dump_interceptor.intercept_to("report_definition", "get-list-repdef")
+    account.report_definitions(true)
+
+    @dump_interceptor.stop
+  end
+
+end

data/spec/{rspec_hash.rb → helpers/rspec_hash.rb}

@@ -1,3 +1,4 @@
+# -*- coding: utf-8 -*-
 # -------------------------------------------------------------------------
 # Copyright (c) 2009-2010 Sem4r sem4ruby@gmail.com
 # 

data/spec/{rspec_matchers.rb → helpers/rspec_matchers.rb}

@@ -1,3 +1,4 @@
+# -*- coding: utf-8 -*-
 # -------------------------------------------------------------------------
 # Copyright (c) 2009-2010 Sem4r sem4ruby@gmail.com
 # 
@@ -19,20 +20,25 @@
 # LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
 # OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
 # WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-# 
 # -------------------------------------------------------------------------
 
 require 'rexml/document'
 require 'differ'
 require 'differ/string'
 
+# comparing xml is always a b-i-a-t-c-h in any testing environment.  here is a
+# little snippet for ruby that, i think, it a good first pass at making it
+# easier.  comment with your improvements please!
+#
+# http://drawohara.com/post/89110816/ruby-comparing-xml
+
 def pretty_xml(xml)
   normalized = Class.new(REXML::Formatters::Pretty) do
     def write_text(node, output)
       super(node.to_s.strip, output)
     end
   end
-  normalized.new(0,false).write(xml, xml_pretty='')
+  normalized.new(0, false).write(xml, xml_pretty='')
   xml_pretty
 end
 
@@ -43,7 +49,7 @@ def normalize_xml(expected_xml)
 
   if expected_xml.class == String
     # erase namespaces i.e. <ns1:tag> -> <tag>
-    expected_xml  = expected_xml.gsub(/\b(ns\d:|xsi:|s:|soapenv:|env:|soap:|^\n)/, "").strip
+    expected_xml = expected_xml.gsub(/\b(ns\d:|xsi:|s:|soapenv:|env:|soap:|^\n)/, "").strip
     begin
       expected_xml = REXML::Document.new(expected_xml)
     rescue RuntimeError
@@ -60,28 +66,28 @@ end
 
 def diff_xml(expected_xml, xml)
   expected_normalized = normalize_xml(expected_xml)
-  xml_normalized = normalize_xml(xml)
+  xml_normalized      = normalize_xml(xml)
 
-  if xml_normalized != expected_normalized
-    puts "----differ start"
+  if xml_normalized == expected_normalized
+    return nil
+  end
+  str =  "--- this xml \n"
+  str << xml_normalized
+  str << "\n--- expected to be equals to\n"
+  str << expected_normalized
 
-    puts xml_normalized
+  str << "\n--- difference are:\n"
 
-    puts "---"
-    puts expected_normalized
-    puts "---"
-    diff = Differ.diff_by_line(xml_normalized, expected_normalized)
-    puts diff.format_as(:ascii)
-    puts "----differ end"
-    false
-  else
-    true
-  end
+  diff = Differ.diff_by_line(xml_normalized, expected_normalized)
+  
+  str << diff.format_as(:ascii)
+  str << "\n----differ end"
+  str
 end
 
 def _xml_contains(expected_xml, xml)
   expected_normalized = normalize_xml(expected_xml)
-  xml_normalized = normalize_xml(xml)
+  xml_normalized      = normalize_xml(xml)
   unless xml_normalized.match(expected_normalized)
     false
   else
@@ -90,13 +96,34 @@ def _xml_contains(expected_xml, xml)
 end
 
 RSpec::Matchers.define :xml_equivalent do |expected_xml|
+  description do
+    "checks if two xml are equivalent"
+  end
+
   match do |xml|
-    diff_xml(expected_xml, xml)
+    if xml.respond_to? :to_xml
+      xml = xml.to_xml
+    end
+    if expected_xml.respond_to? :to_xml
+      expected_xml = expected_xml.to_xml
+    end
+    @diff_result = diff_xml(expected_xml, xml)
+    @diff_result.nil?  # no diff
+  end
+
+  failure_message_for_should do |expected_xml|
+    "#{@diff_result}"
   end
 end
 
 RSpec::Matchers.define :xml_contains do |expected_xml|
   match do |xml|
+    if xml.respond_to? :to_xml
+      xml = xml.to_xml
+    end
+    if expected_xml.respond_to? :to_xml
+      expected_xml = expected_xml.to_xml
+    end
     _xml_contains(expected_xml, xml)
   end
 end

data/spec/{rspec_sem4r_helper.rb → helpers/rspec_sem4r_helper.rb}

@@ -1,3 +1,4 @@
+# -*- coding: utf-8 -*-
 # -------------------------------------------------------------------------
 # Copyright (c) 2009-2010 Sem4r sem4ruby@gmail.com
 # 
@@ -19,15 +20,8 @@
 # LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
 # OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
 # WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-# 
 # -------------------------------------------------------------------------
 
-# comparing xml is always a b-i-a-t-c-h in any testing environment.  here is a
-# little snippet for ruby that, i think, it a good first pass at making it
-# easier.  comment with your improvements please!
-#
-# http://drawohara.com/post/89110816/ruby-comparing-xml
-
 module Sem4rSpecHelper
 
   require "stringio"
@@ -45,9 +39,8 @@ module Sem4rSpecHelper
 
   #############################################################################
 
-  def read_xml(service, xml_file, *args)
-    # xml_filepath  = File.join(File.dirname(__FILE__), "fixtures", *args)
-    xml_filepath  = File.join(File.dirname(__FILE__), "sem4r", service, "fixtures", xml_file)
+  def read_xml(service, file_name)
+    xml_filepath  = File.expand_path File.join(File.dirname(__FILE__), "..", "sem4r", service, "fixtures", file_name)
     unless File.exist?(xml_filepath)
       raise "file #{xml_filepath} not exists"
     end
@@ -57,8 +50,18 @@ module Sem4rSpecHelper
     contents
   end
 
-  def read_model(xpath, service, xml_file, *args, &blk)
-    contents = read_xml(service, xml_file, *args)
+  def write_xml(service, file_name, xml)
+    fixture_dir  = File.expand_path File.join(File.dirname(__FILE__), "..", "sem4r", service, "fixtures")
+    FileUtils.mkdir_p(fixture_dir) unless File.directory?(fixture_dir)
+    pathname = File.join(fixture_dir, file_name)
+    puts "writing to #{pathname}"
+    File.open(pathname, "w") { |f|
+      f.puts xml
+    }
+  end
+
+  def read_model(xpath, service, xml_file, &blk)
+    contents = read_xml(service, xml_file)
     xml_document = Nokogiri::XML::Document.parse(contents)
     if xpath && blk
       el = xml_document.xpath(xpath).each do |node|
@@ -75,13 +78,13 @@ module Sem4rSpecHelper
     el
   end
 
-  def read_xml_document(service, xml_file, *args)
-    contents = read_xml(service, xml_file, *args)
+  def read_xml_document(service, xml_file)
+    contents = read_xml(service, xml_file)
     Nokogiri::XML::Document.parse(contents)
   end
 
-  def read_xml_document_with_rexml(service, xml_file, *args)
-    contents = read_xml(service, xml_file, *args)
+  def read_xml_document_with_rexml(service, xml_file)
+    contents = read_xml(service, xml_file)
     REXML::Document.new(contents)
   end
 

data/spec/{sem4r_stubs.rb → helpers/sem4r_stubs.rb}

@@ -1,3 +1,4 @@
+# -*- coding: utf-8 -*-
 # -------------------------------------------------------------------------
 # Copyright (c) 2009-2010 Sem4r sem4ruby@gmail.com
 # 
@@ -19,10 +20,8 @@
 # LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
 # OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
 # WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-# 
 # -------------------------------------------------------------------------
 
-
 module Sem4rSpecHelper
 
   #############################################################################
@@ -107,7 +106,9 @@ module Sem4rSpecHelper
   end
 
   def stub_service_report_definition(service)
-    service_report_definition   = stub("service_report_definition")
+    xml_document = read_xml_document("report_definition", "mutate-add-report-res.xml")
+    soap_message = stub("soap_message", :response => xml_document, :counters => nil)
+    service_report_definition   = stub("service_report_definition", :mutate => soap_message  )
     service.stub(:report_definition).and_return(service_report_definition)
   end
 
@@ -179,4 +180,4 @@ module Sem4rSpecHelper
       :id                 => 1000,
       :ad_group           => stub_adgroup(services))
   end
-end
+end

data/spec/rspec_helper.rb

@@ -1,3 +1,4 @@
+# -*- coding: utf-8 -*-
 $LOAD_PATH.unshift(File.join(File.dirname(__FILE__), '..', 'lib'))
 $LOAD_PATH.unshift(File.dirname(__FILE__))
 
@@ -5,10 +6,9 @@ require 'sem4r'
 require 'sem4r_cli'
 include Sem4r
 
-require 'rspec_sem4r_helper'
-require 'rspec_matchers'
-require 'sem4r_stubs'
-require 'aggregates_rspec_helper'
+require 'helpers/rspec_sem4r_helper'
+require 'helpers/rspec_matchers'
+require 'helpers/sem4r_stubs'
 
 # Spec::Runner.configure do |config|
 # end

data/spec/sem4r/account_spec.rb

@@ -1,3 +1,4 @@
+# -*- coding: utf-8 -*-
 # -------------------------------------------------------------------------
 # Copyright (c) 2009-2010 Sem4r sem4ruby@gmail.com
 # 
@@ -19,7 +20,6 @@
 # LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
 # OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
 # WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-# 
 # -------------------------------------------------------------------------
 
 require File.expand_path(File.dirname(__FILE__) + '/../rspec_helper')
@@ -76,10 +76,9 @@ describe Account do
   end
 
   describe "reports management" do
-
     it "should show reports " do
       @account.should have(4).reports
     end
-
   end
+
 end

data/spec/sem4r/ad_group/ad_group_service_spec.rb

@@ -37,7 +37,7 @@ describe AdGroupService do
     connector = mock("connector")
     connector.should_receive(:send).and_return(response_xml)
     service = AdGroupService.new(connector)
-    soap_message = service.all( @credentials, "campaign_id" )
+    soap_message = service.all(@credentials, "campaign_id" )
     els = soap_message.response.xpath("//getResponse")
     els.should_not be_empty
   end

data/spec/sem4r/ad_group/ad_group_spec.rb

@@ -181,7 +181,7 @@ describe AdGroup do
   describe "ad_param management" do
 
     it "should create a AdParam with method 'ad_param' + block" do
-      criterion = @criterion # it is necessary to pass to following block
+      criterion = @criterion # it is necessary to the following block
       adgroup = AdGroup.new(@campaign) do
         name "adgroup"
         ad_param(criterion) do

data/spec/sem4r/ad_group_ad/ad_group_ad_operation_spec.rb

@@ -56,7 +56,7 @@ describe AdGroupAdOperation do
   end
 
   it "should produce xml (input for google) with two operation" do
-    pending "test"
+    pending "waiting to finish build fixture"
     @adgroup = stub_adgroup
 
     text_ad_1 = AdGroupTextAd.new(@adgroup) do
@@ -75,8 +75,8 @@ describe AdGroupAdOperation do
       url           "http://www.Sem4R.com"
     end
 
-    ad_operation_1 = AdGroupAdOperation.new.add text_ad_1
-    ad_operation_2 = AdGroupAdOperation.new.add text_ad_2
+    ad_operation_1 = AdGroupAdOperation.add text_ad_1
+    ad_operation_2 = AdGroupAdOperation.add text_ad_2
 
     puts ad_operation_1.to_xml("operations")
     puts ad_operation_2.to_xml("operations")

data/spec/sem4r/adwords_spec.rb

@@ -1,3 +1,4 @@
+# -*- coding: utf-8 -*-
 # -------------------------------------------------------------------------
 # Copyright (c) 2009-2010 Sem4r sem4ruby@gmail.com
 # 
@@ -19,7 +20,6 @@
 # LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
 # OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
 # WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-# 
 # -------------------------------------------------------------------------
 
 require File.expand_path(File.dirname(__FILE__) + '/../rspec_helper')
@@ -27,37 +27,38 @@ require File.expand_path(File.dirname(__FILE__) + '/../rspec_helper')
 describe Adwords do
 
   before(:each) do
-    @test_config_filename = File.expand_path(File.dirname(__FILE__) + "/../fixtures/sem4r.example.yml")
-
-    @environment       = "sandbox"
-    @email             = "pippo"
-    @password          = "password"
-    @developer_token   = "developer_token"
-
-    @options = {
-      :environment       => @environment,
-      :email             => @email,
-      :password          => @password,
-      :developer_token   => @developer_token,
+    @test_config_filename   = File.expand_path(File.dirname(__FILE__) + "/../fixtures/sem4r.example.yml")
+    @test_password_filename = File.expand_path(File.dirname(__FILE__) + "/../fixtures/password.example.yml")
+
+    @environment          = "sandbox"
+    @email                = "sem4ruby@sem4r.com"
+    @password             = "password"
+    @developer_token      = "developer_token"
+
+    @options              = {
+        :environment     => @environment,
+        :email           => @email,
+        :password        => @password,
+        :developer_token => @developer_token,
     }
   end
 
   it "should take an hash as configuration" do
-    adwords = Adwords.new( @options )
+    adwords = Adwords.new(@options)
     adwords.should_not_receive(:load_config)
     credentials = adwords.account.credentials
 
-    adwords.profile.should               == "anonymous_" + @environment
-    credentials.environment.should       == @environment
-    credentials.email.should             == @email
-    credentials.password.should          == @password
-    credentials.developer_token.should   == @developer_token
+    adwords.profile.should == "anonymous_" + @environment
+    credentials.environment.should == @environment
+    credentials.email.should == @email
+    credentials.password.should == @password
+    credentials.developer_token.should == @developer_token
     credentials.should_not be_mutable
   end
 
   it "should be mutable" do
     @options[:mutable] = true
-    adwords = Adwords.new( @options )
+    adwords            = Adwords.new(@options)
     adwords.should_not_receive(:load_config)
     credentials = adwords.account.credentials
     credentials.should be_mutable
@@ -65,46 +66,68 @@ describe Adwords do
 
   it "should set the right environment (sandbox)" do
     @options.delete(:environment)
-
-    adwords = Adwords.sandbox( @options )
+    adwords     = Adwords.sandbox(@options)
     credentials = adwords.account.credentials
-    credentials.environment.should       == "sandbox"
-    credentials.email.should             == @email
+    credentials.environment.should == "sandbox"
+    credentials.email.should == @email
   end
 
   it "should set the right environment (production)" do
     @options.delete(:environment)
-    adwords = Adwords.production( @options )
+    adwords     = Adwords.production(@options)
     credentials = adwords.account.credentials
-    credentials.environment.should       == "production"
-    credentials.email.should             == @email
+    credentials.environment.should == "production"
+    credentials.email.should == @email
   end
-    
+
   it "should raise an exception when profile is sandbox and env is production" do
-    @options[:environment] = "prodution"
-    lambda { adwords = Adwords.sandbox( @options ) }.should raise_error(RuntimeError)
+    @options[:environment] = "production"
+    expect {
+      Adwords.sandbox(@options)
+    }.to raise_error("you cannot use profile 'sandbox' with environment 'production'")
 
     @options[:environment] = "sandbox"
-    lambda { adwords = Adwords.production( @options ) }.should raise_error(RuntimeError)
+    expect {
+      Adwords.production(@options)
+    }.to raise_error("you cannot use profile 'production' with environment 'sandbox'")
   end
 
   it "should read config file (profile file)" do
-    adwords = Adwords.new( "sandbox", {:config_file => @test_config_filename} )
+    adwords     = Adwords.new("sandbox", {:config_file => @test_config_filename})
     credentials = adwords.account.credentials
-    credentials.environment.should       == "sandbox"
-    credentials.developer_token.should   == "example@gmail.com++EUR"
+    credentials.environment.should == "sandbox"
+    credentials.developer_token.should == "example@gmail.com++EUR"
 
-    adwords = Adwords.new( "production1", {:config_file => @test_config_filename} )
+    adwords     = Adwords.new("production1", {:config_file => @test_config_filename})
     credentials = adwords.account.credentials
-    credentials.environment.should       == "production"
-    credentials.developer_token.should   == "productiondevelopertoken"
+    credentials.environment.should == "production"
+    credentials.developer_token.should == "productiondevelopertoken"
   end
 
-
   it "should list profiles" do
     values = Adwords.profiles(@test_config_filename)
-    values.should have(4).profiles
+    values.should have(5).profiles
   end
 
+  it "should need a password" do
+    @options.delete(:password)
+    adwords = Adwords.new(@options)
+    adwords.should_not have_password
+    adwords.password= "prova"
+    adwords.should have_password
+  end
+
+  it "should use password file" do
+    adwords     = Adwords.new("env_wo_password", {
+        :config_file => @test_config_filename,
+        :password_file => @test_password_filename
+    })
+    credentials = adwords.account.credentials
+    credentials.environment.should == "sandbox"
+    credentials.developer_token.should == "env_wo_password@gmail.com++EUR"
+    credentials.password.should == "env_password"
+
+    # adwords.save_passwords
+  end
 end