From 68fed27bf95162255c1754d4adf3ca8bbf92414b Mon Sep 17 00:00:00 2001 From: Joe Straitiff Date: Tue, 9 Apr 2013 10:25:39 -0700 Subject: [PATCH] fixing spec when using ruby 1.9.3, also some upgrades for testing w/ ci --- .gitignore | 2 + Gemfile | 9 ++-- Gemfile.lock | 38 +++++++++-------- spec/lib/eloqua/builder/xml_spec.rb | 64 ++++++++++++++--------------- 4 files changed, 58 insertions(+), 55 deletions(-) diff --git a/.gitignore b/.gitignore index 9892be3..bed3a31 100644 --- a/.gitignore +++ b/.gitignore @@ -7,3 +7,5 @@ doc .yardoc test.rb spec/reports +/nbproject +/nbproject/private/ diff --git a/Gemfile b/Gemfile index a08a581..6af13c7 100644 --- a/Gemfile +++ b/Gemfile @@ -1,12 +1,13 @@ -source :rubygems +source 'http://rubygems.org' +gem 'rake' gem 'savon' gem 'builder' -gem 'activemodel' -gem 'activesupport' +gem 'activemodel', '~> 3.0.20' +gem 'activesupport', '~> 3.0.20' gem 'savon_spec', :groups => [:test, :development] -gem 'rspec', "> 2.0", :groups => [:test, :development] +gem 'rspec', "2.12", :groups => [:test, :development] gem 'flexmock', :group => [:test, :development] gem 'timecop', :groups => [:test, :development] gem 'ci_reporter', :group => :test diff --git a/Gemfile.lock b/Gemfile.lock index 15ec177..ce9a72f 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -1,17 +1,17 @@ GEM remote: http://rubygems.org/ specs: - activemodel (3.0.6) - activesupport (= 3.0.6) + activemodel (3.0.20) + activesupport (= 3.0.20) builder (~> 2.1.2) i18n (~> 0.5.0) - activesupport (3.0.6) + activesupport (3.0.20) builder (2.1.2) - ci_reporter (1.6.4) + ci_reporter (1.8.4) builder (>= 2.1.2) crack (0.1.8) - diff-lcs (1.1.2) - flexmock (0.9.0) + diff-lcs (1.1.3) + flexmock (1.3.1) gyoku (0.4.2) builder (>= 2.1.2) httpi (0.9.2) @@ -21,14 +21,15 @@ GEM mocha (0.9.12) ntlm-http (0.1.1) rack (1.2.2) - rspec (2.5.0) - rspec-core (~> 2.5.0) - rspec-expectations (~> 2.5.0) - rspec-mocks (~> 2.5.0) - rspec-core (2.5.1) - rspec-expectations (2.5.0) - diff-lcs (~> 1.1.2) - rspec-mocks (2.5.0) + rake (10.0.3) + rspec (2.12.0) + rspec-core (~> 2.12.0) + rspec-expectations (~> 2.12.0) + rspec-mocks (~> 2.12.0) + rspec-core (2.12.2) + rspec-expectations (2.12.1) + diff-lcs (~> 1.1.3) + rspec-mocks (2.12.2) ruby-fsevent (0.2.1) savon (0.8.6) builder (>= 2.1.2) @@ -39,19 +40,20 @@ GEM mocha (>= 0.9.8) rspec (>= 2.0.0) savon (~> 0.8.0) - timecop (0.3.5) + timecop (0.6.1) watchr (0.7) PLATFORMS ruby DEPENDENCIES - activemodel - activesupport + activemodel (~> 3.0.20) + activesupport (~> 3.0.20) builder ci_reporter flexmock - rspec (> 2.0) + rake + rspec (= 2.12) ruby-fsevent savon savon_spec diff --git a/spec/lib/eloqua/builder/xml_spec.rb b/spec/lib/eloqua/builder/xml_spec.rb index 5a9db8c..81bdb1b 100644 --- a/spec/lib/eloqua/builder/xml_spec.rb +++ b/spec/lib/eloqua/builder/xml_spec.rb @@ -1,29 +1,27 @@ require 'spec_helper' describe Eloqua::Builder::Xml do - + def xml!(&block) subject.create(&block) end subject { Eloqua::Builder::Xml } - + # We might reveal methods on builder so create blank subclass subject { Class.new(Eloqua::Builder::Xml) do - reveal(:class) - reveal(:is_a?) end } let(:xml) do subject.new(:namespace => 'wsdl') - end - + end + it "should include Eloqua::Builder::Templates" do subject.should include(Eloqua::Builder::Templates) end - + it 'should allow a block during new providing self' do subject.new do |xml| xml.is_a?(subject) @@ -31,7 +29,7 @@ def xml!(&block) end context "when default namespace options is set" do - + let(:xml) do subject.new(:namespace => 'wsdl') end @@ -45,48 +43,48 @@ def xml!(&block) output = xml.arr(:int) {} output.strip.should == '' end - + end - + # Entity/Asset Helpers - + context '#dynamic_object!' do - + let(:expected) { 'content' } - + it 'should return expected xml' do xml! {|xml| xml.dynamic_object!(:asset, 'content') }.should == expected end - + end - + context '#object_type!' do let(:expected) { 'content' } - + it 'should return expected xml' do xml! {|xml| xml.object_type!(:asset, 'content') }.should == expected end - + end - + context '#object_type_lower!' do let(:expected) { 'content' } - + it 'should return expected xml' do xml! {|xml| xml.object_type_lower!(:asset, 'content') }.should == expected end - - end - + + end + context '#object_collection!' do let(:expected) { "1" } it 'should return expected xml' do xml! {|xml| xml.object_collection!(:entity) { xml.one('1') } }.should == expected end end - + context "#self.create" do - + let(:klass) do Class.new(subject) do define_builder_template(:zomg) do |xml| @@ -94,11 +92,11 @@ def xml!(&block) end end end - + let(:xml_body) do '1zomg' end - + it 'should produce expected output' do out = klass.create do |xml| xml.big('1') @@ -106,9 +104,9 @@ def xml!(&block) end out.should == xml_body end - + end - + context 'xml templates' do share_examples_for "expected template output" do |template| @@ -132,12 +130,12 @@ def xml!(&block) let(:entity) do Eloqua::Api.remote_type('Contact') end - + context ':object' do let(:args) do ['random', Eloqua::Api.remote_type('Contact'), 1] end - + let(:expected) do xml! do |xml| xml.random do @@ -148,9 +146,9 @@ def xml!(&block) end end end - + it_behaves_like 'expected template output', :object - + end context ':dynamic' do @@ -256,7 +254,7 @@ def xml!(&block) end - end + end end