sk-api 1.0.6 → 1.1.0

data/spec/resources/invoice_spec.rb

@@ -1,4 +1,4 @@
-require "#{File.dirname(__FILE__)}/../spec_helper"
+require 'spec/spec_helper'
 
 describe SKApi::Resources::Invoice, "in general" do
 
@@ -34,10 +34,24 @@ describe SKApi::Resources::Invoice, "a new invoice" do
   it "should create a doc" do
     doc = SKApi::Resources::Invoice.new()
     doc.title = 'A Document from the API'
+    doc.notes_before = 'Your shiny new invoice [number]'
+    doc.notes_after = 'Please pay me'
     doc.client_id = @client.id
     doc.save
     doc.errors.should be_empty
     doc.new?.should be_false
+    doc.notes_before.should == 'Your shiny new invoice [number]'
+    doc.destroy
+  end
+
+  it "should create a doc with default before after texts" do
+    doc = SKApi::Resources::Invoice.new()
+    doc.title = 'A Document from the API'
+    doc.client_id = @client.id
+    doc.save
+    doc.errors.should be_empty
+    doc.new?.should be_false
+    doc.notes_before.should_not be_empty
     doc.destroy
   end
 
@@ -59,6 +73,7 @@ describe SKApi::Resources::Invoice, "Edit an invoice" do
     @client.save.should be_true
     @doc = SKApi::Resources::Invoice.new()
     @doc.title = 'A Document from the API'
+    @doc.notes_before = 'Your invoice [number]'
     @doc.client_id = @client.id
     @doc.save.should be_true
   end
@@ -69,12 +84,14 @@ describe SKApi::Resources::Invoice, "Edit an invoice" do
 
   it "should edit a doc" do
     old_lock_version = @doc.lock_version
+    @doc.notes_before.should == 'Your invoice [number]'
     @doc.notes_before = 'You will recieve the amout of:'
-    @doc.notes_before = 'Payment made to you bank Account'
+    @doc.notes_after = 'Payment made to you bank Account'
     @doc.title = 'Changed doc title'
 
     @doc.save.should be_true
     @doc.lock_version.should > old_lock_version # because save returns the data
+    @doc.notes_before.should == 'You will recieve the amout of:'
   end
 
   it "should fail edit without a client" do
@@ -92,7 +109,7 @@ describe SKApi::Resources::Invoice, "with line items" do
     @client.save.should be_true
     #setup test doc to work with
     @doc = SKApi::Resources::Invoice.new(:client_id => @client.id,
-                                          :line_items => [{ :position=>1, :description => 'Pork Chops', :quantity => 12, :price_single =>'10.00' }] )
+                                         :line_items => [{ :position=>1, :description => 'Pork Chops', :quantity => 12, :price_single =>'10.00' }] )
     @doc.save.should be_true
   end
 
@@ -126,54 +143,3 @@ describe SKApi::Resources::Invoice, "with line items" do
   end
 
 end
-=begin
-describe SKApi::Resources::Invoice, "with line items" do
-
-  before :all do
-    @client = SKApi::Resources::Client.new(:organisation=>'Credit Note API-Tester')
-    @client.save.should be_true
-    #setup test doc to work with
-    @doc = SKApi::Resources::Invoice.new(:client_id => @client.id,
-                                          :line_items => [{ :position=>1, :description => 'Pork Chops', :quantity => 12, :price_single =>'10.00' }] )
-    @doc.save.should be_true
-  end
-
-  after :all do
-    delete_test_data(@doc, @client)
-  end
-
-  it "should create a line item" do
-    @doc.line_items.length.should == 1
-    @doc.line_items.first.description.should == 'Pork Chops'
-    @doc.price_total.should == 120.0
-  end
-
-  it "should edit line item" do
-    @doc.line_items[0].description = 'Egg Sandwich'
-    @doc.save
-    @doc.line_items.length.should == 1
-    @doc.line_items.first.description.should == 'Egg Sandwich'
-  end
-
-  it "should add line item" do
-    item = SKApi::Resources::LineItem.new( {  :position=>2, :description => 'Goat-Pie', :price_single => 10, :quantity=>10} )
-    product = SKApi::Resources::Product.new(:name=>'Eis am Stiel', :price => 1.50, :tax=>19, :description => 'Mmmhh lecker Eis')
-    product.save.should be_true
-    item1 = SKApi::Resources::LineItem.new( { :position=>3, :use_product => 1, :quantity => 10 } )
-    @doc.line_items << item
-    @doc.line_items << item1
-    @doc.save
-    @doc.line_items.length.should == 3
-    @doc.price_total.should == 220.0
-  end
-
-  xit "should add line item and use product information" do
-
-    @doc.line_items << item
-    @doc.save
-    @doc.line_items.length.should == 3
-    @doc.price_total.should == 15.0
-
-    product.destroy
-  end
-=end

data/spec/resources/product_spec.rb

@@ -1,4 +1,4 @@
-require "#{File.dirname(__FILE__)}/../spec_helper"
+require 'spec/spec_helper'
 
 describe SKApi::Resources::Product, "in general" do
 
@@ -29,11 +29,10 @@ describe SKApi::Resources::Product, "in general" do
     product.errors.full_messages.should ==  ["Name can't be blank"]
   end
   
-  it "should create a product with price 0.0 when price is missing" do
+  it "should fail create a product without price" do
     product = SKApi::Resources::Product.new(:name => 'No brain')
-    product.save
-#    product.save.should == false
-    product.price.should == 0.0
+    product.save.should == false
+    product.errors.full_messages.should ==  ["Price can't be blank"]
   end
 
   it "should find a product by id" do
@@ -59,9 +58,9 @@ describe SKApi::Resources::Product, "in general" do
     product = SKApi::Resources::Product.find(@product.id)
     # convert to json and read raw without activeresource assigning classes
     json = product.to_json
-    obj = Rufus::Json.decode(json)
+    obj = ActiveSupport::JSON.decode(json)
     lambda {
-      JSON::Schema.validate(obj,  SKApi::Resources::Product.schema)
+      JSON::Schema.validate(obj['product'],  SKApi::Resources::Product.schema)
     }.should_not raise_error
   end
 
@@ -69,7 +68,6 @@ describe SKApi::Resources::Product, "in general" do
     product = SKApi::Resources::Product.find(@product.id)
     # convert to json and read raw without activeresource assigning classes
     hash_obj =  SKApi::Resources::Product.to_hash_from_schema(product)
-#    hash_obj.should == ''
     lambda {
       JSON::Schema.validate(hash_obj['product'],  SKApi::Resources::Product.schema)
     }.should_not raise_error

data/spec/spec_helper.rb

@@ -3,6 +3,7 @@ require 'spec'
 require "#{File.dirname(__FILE__)}/../lib/sk_api"
 require File.dirname(__FILE__) + '/../vendor/jsonschema-1.0.0/lib/jsonschema'
 
+puts "Testing with ActiveResource Version: #{ActiveResource::VERSION::STRING}. Make sure this matches the version in your app. .. Yes this sucks!"
 
 def delete_test_data(doc, client)
   doc.destroy

data/spec/utils/field_map_spec.rb

@@ -1,4 +1,4 @@
-require "#{File.dirname(__FILE__)}/../spec_helper"
+require 'spec/spec_helper'
 
 describe SKApi::Utils::FieldMap do