profitbricks 0.9.9 → 1.0.0

data/spec/profitbricks/storage_spec.rb

@@ -1,37 +1,40 @@
 require 'spec_helper'
 
 describe Profitbricks::Storage do
-  include Savon::Spec::Macros
+  include Savon::SpecHelper
+
+  before(:all) { savon.mock!   }
+  after(:all)  { savon.unmock! }
 
   it "should create a new server with minimal arguments" do
-    savon.expects(:create_storage).with("<arg0><dataCenterId>b3eebede-5c78-417c-b1bc-ff5de01a0602</dataCenterId><size>5</size><storageName>Test Storage</storageName></arg0>").returns(:success)
-    savon.expects(:get_storage).with('<storageId>f55952bc-da27-4e29-af89-ed212ea28e11</storageId>').returns(:success)
+    savon.expects(:create_storage).with(message: {arg0: {data_center_id: 'b3eebede-5c78-417c-b1bc-ff5de01a0602', size: 5, storage_name: 'Test Storage'}}).returns(f :create_storage, :success)
+    savon.expects(:get_storage).with(message: {storage_id: 'f55952bc-da27-4e29-af89-ed212ea28e11'}).returns(f :get_storage, :success)
     storage = Storage.create(:size => 5, :name => "Test Storage", :data_center_id => "b3eebede-5c78-417c-b1bc-ff5de01a0602")
     storage.name.should == "Test Storage"
     storage.size.should == 5
   end
 
   it "should be connectable to a server" do
-    savon.expects(:get_storage).returns(:success)
-    savon.expects(:connect_storage_to_server).returns(:success)
-    savon.expects(:get_server).returns(:connected_storage)
+    savon.expects(:get_storage).with(message: {storage_id: 'f55952bc-da27-4e29-af89-ed212ea28e11'}).returns(f :get_storage, :success)
+    savon.expects(:connect_storage_to_server).with(message: {arg0: {storage_id: 'f55952bc-da27-4e29-af89-ed212ea28e11', server_id: '4cb6550f-3777-4818-8f4c-51233162a980', bus_type: 'VIRTIO'}}).returns(f :connect_storage_to_server, :success)
+    savon.expects(:get_server).with(message: {server_id: '4cb6550f-3777-4818-8f4c-51233162a980'}).returns(f :get_server, :connected_storage)
     storage = Storage.find(:id => "f55952bc-da27-4e29-af89-ed212ea28e11")
     storage.connect(:server_id => "4cb6550f-3777-4818-8f4c-51233162a980", :bus_type => "VIRTIO").should == true
     s = Server.find(:id => "4cb6550f-3777-4818-8f4c-51233162a980")
     # FIXME
-    s.connected_storages[:storage_name].should == "Test Storage"
+    s.connected_storages.first.name.should == "Test Storage"
   end
 
   it "should be disconnectable from a server" do
-    savon.expects(:get_storage).returns(:success)
-    savon.expects(:disconnect_storage_from_server).returns(:success)
+    savon.expects(:get_storage).with(message: {storage_id: 'f55952bc-da27-4e29-af89-ed212ea28e11'}).returns(f :get_storage, :success)
+    savon.expects(:disconnect_storage_from_server).with(message: {storage_id: 'f55952bc-da27-4e29-af89-ed212ea28e11', server_id: '4cb6550f-3777-4818-8f4c-51233162a980'}).returns(f :disconnect_storage_from_server ,:success)
     storage = Storage.find(:id => "f55952bc-da27-4e29-af89-ed212ea28e11")
     storage.disconnect(:server_id => "4cb6550f-3777-4818-8f4c-51233162a980").should == true
   end
   
   it "should be updated" do
-    savon.expects(:get_storage).returns(:success)
-    savon.expects(:update_storage).returns(:success)
+    savon.expects(:get_storage).with(message: {storage_id: 'f55952bc-da27-4e29-af89-ed212ea28e11'}).returns(f :get_storage, :success)
+    savon.expects(:update_storage).with(message: {arg0: {storage_id: 'f55952bc-da27-4e29-af89-ed212ea28e11', size: 10, storage_name: 'Updated'}}).returns(f :update_storage, :success)
     storage = Storage.find(:id => "f55952bc-da27-4e29-af89-ed212ea28e11")
     storage.update(:name => "Updated", :size => 10).should == true
     storage.name.should == "Updated"
@@ -39,9 +42,15 @@ describe Profitbricks::Storage do
   end
 
   it "should be deleted" do
-    savon.expects(:get_storage).with('<storageId>f55952bc-da27-4e29-af89-ed212ea28e11</storageId>').returns(:success)
-    savon.expects(:delete_storage).with('<storageId>f55952bc-da27-4e29-af89-ed212ea28e11</storageId>').returns(:success)
+    savon.expects(:get_storage).with(message: {storage_id: 'f55952bc-da27-4e29-af89-ed212ea28e11'}).returns(f :get_storage, :success)
+    savon.expects(:delete_storage).with(message: {storage_id: 'f55952bc-da27-4e29-af89-ed212ea28e11'}).returns(f :delete_storage, :success)
     storage = Storage.find(:id => "f55952bc-da27-4e29-af89-ed212ea28e11")
     storage.delete.should == true
   end
+
+  it "should correctly declare the mount_image attribute" do
+    savon.expects(:get_storage).with(message: {storage_id: "0e3f262c-c014-d66e-0f81-9faac27c41c8"}).returns(f :get_storage, :mount_image)
+    storage = Storage.find(:id => "0e3f262c-c014-d66e-0f81-9faac27c41c8")
+    storage.mount_image.class.should == Image
+  end
 end

data/spec/spec_helper.rb

@@ -7,46 +7,33 @@
 require "bundler"
 Bundler.require(:default, :development)
 
+require "savon/mock/spec_helper"
+
 if ENV['COVERAGE']
   require 'simplecov'
   SimpleCov.start
-end
-
-require 'coveralls'
-Coveralls.wear!
-
-Savon.configure do |config|
-  config.log = false
+else
+  require 'coveralls'
+  Coveralls.wear!
 end
 
 RSpec.configure do |config|
   config.treat_symbols_as_metadata_keys_with_true_values = true
   config.run_all_when_everything_filtered = true
   config.filter_run :focus
-  config.include Savon::Spec::Macros
+  config.mock_with :rspec 
 end
 
-
-Savon::Spec::Fixture.path = File.expand_path("../fixtures", __FILE__)
+def f method, response
+  File.read File.join(File.expand_path("../fixtures", __FILE__), method.to_s, "#{response.to_s}.xml")
+end
 
 require 'profitbricks'
 
-Savon.configure do |config|
-  config.log = false 
-  config.log_level = :error
-end
 HTTPI.log = false
-client = Savon::Client.new do |wsdl, http|
-  wsdl.endpoint = "https://api.profitbricks.com/1.1"
-  wsdl.document = "https://api.profitbricks.com/1.1/wsdl"
-  if defined?(RUBY_ENGINE) && RUBY_ENGINE == 'jruby' && !ENV['SSL_CERT_DIR']
-    puts "Warning: SSL certificate verification has been disabled"
-    http.auth.ssl.verify_mode = :none
-  end
-end
 
 Profitbricks.configure do |config|
   config.username = "none"
   config.password = "none"
+  config.polling_interval = 0.1 
 end
-Profitbricks.client = client

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: profitbricks
 version: !ruby/object:Gem::Version
-  version: 0.9.9
+  version: 1.0.0
 platform: ruby
 authors:
 - Dominik Sander
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-05-01 00:00:00.000000000 Z
+date: 2013-06-18 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: savon
@@ -16,14 +16,14 @@ dependencies:
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 1.2.0
+        version: 2.2.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 1.2.0
+        version: 2.2.0
 - !ruby/object:Gem::Dependency
   name: rdoc
   requirement: !ruby/object:Gem::Requirement
@@ -67,6 +67,7 @@ files:
 - CHANGELOG.md
 - Gemfile
 - Gemfile.lock
+- Guardfile
 - Manifest.txt
 - README.md
 - Rakefile
@@ -168,8 +169,14 @@ files:
 - spec/fixtures/get_server/after_create.xml
 - spec/fixtures/get_server/connected_storage.json
 - spec/fixtures/get_server/connected_storage.xml
+- spec/fixtures/get_server/two_nics.json
+- spec/fixtures/get_server/two_nics.xml
+- spec/fixtures/get_storage/mount_image.json
+- spec/fixtures/get_storage/mount_image.xml
 - spec/fixtures/get_storage/success.json
 - spec/fixtures/get_storage/success.xml
+- spec/fixtures/power_off_server/success.json
+- spec/fixtures/power_off_server/success.xml
 - spec/fixtures/reboot_server/success.json
 - spec/fixtures/reboot_server/success.xml
 - spec/fixtures/register_servers_on_load_balancer/success.json
@@ -182,10 +189,16 @@ files:
 - spec/fixtures/remove_public_ip_from_nic/success.xml
 - spec/fixtures/reserve_public_ip_block/success.json
 - spec/fixtures/reserve_public_ip_block/success.xml
+- spec/fixtures/reset_server/success.json
+- spec/fixtures/reset_server/success.xml
 - spec/fixtures/set_image_os_type/success.json
 - spec/fixtures/set_image_os_type/success.xml
 - spec/fixtures/set_internet_access/success.json
 - spec/fixtures/set_internet_access/success.xml
+- spec/fixtures/shutdown_server/success.json
+- spec/fixtures/shutdown_server/success.xml
+- spec/fixtures/start_server/success.json
+- spec/fixtures/start_server/success.xml
 - spec/fixtures/update_data_center/success.json
 - spec/fixtures/update_data_center/success.xml
 - spec/fixtures/update_load_balancer/success.json
@@ -196,6 +209,8 @@ files:
 - spec/fixtures/update_server/basic.xml
 - spec/fixtures/update_storage/success.json
 - spec/fixtures/update_storage/success.xml
+- spec/live/data_center_spec.rb
+- spec/live/server_spec.rb
 - spec/profitbricks/cli_spec.rb
 - spec/profitbricks/data_center_spec.rb
 - spec/profitbricks/firewall_spec.rb
@@ -207,7 +222,6 @@ files:
 - spec/profitbricks/server_spec.rb
 - spec/profitbricks/storage_spec.rb
 - spec/spec_helper.rb
-- .gemtest
 homepage: http://github.com/dsander/profitbricks
 licenses: []
 metadata: {}