test/solusvm/test_client.rb in solusvm-1.2.1 vs test/solusvm/test_client.rb in solusvm-1.3.0

@@ -1,16 +1,15 @@
 require 'test_helper'
 
 class TestClient < Test::Unit::TestCase
 
   def setup
-    setup_solusvm
-    @client = Solusvm::Client.new
+    @client = Solusvm::Client.new(solusvm_params)
   end
 
   def test_create
-    options = {:username => 'vps123', :password=> '123456', :email=> '[e-mail]', :firstname => 'phill', :lastname => 'smith'}
+    options = {username: 'vps123', password: '123456', email: '[e-mail]', firstname: 'phill', lastname: 'smith'}
     VCR.use_cassette "client/create" do
       @client.create(options)
     end
     params = @client.returned_parameters
     assert_equal options[:username], params['username']
@@ -26,18 +25,18 @@
     VCR.use_cassette "client/create" do
       assert ! @client.create
     end
     assert_equal 'Empty username field', @client.statusmsg
   end
-  
+
   def test_exists
     VCR.use_cassette "client/exists" do
       assert @client.exists?("vps123")
     end
-    assert_equal 'Client exists', @client.statusmsg    
+    assert_equal 'Client exists', @client.statusmsg
   end
-  
+
   def test_change_password
     VCR.use_cassette "client/change_password" do
       assert @client.change_password("vps123","123456")
     end
   end
@@ -72,17 +71,17 @@
       assert !@client.delete("novps")
     end
   end
 
   def test_list
-    Solusvm.config("api_id1", api_login[:key], :url => 'http://www.example.com/api')
+    @client = Solusvm::Client.new(api_id: "api_id1", api_key: api_login[:key], url: 'http://www.example.com/api')
     VCR.use_cassette "client/list" do
       @client.list
     end
 
     client = @client.returned_parameters["clients"]["client"].first
-    
+
     assert_equal "1", client["id"]
     assert_equal "vps123", client["username"]
     assert_equal "[e-mail]", client["email"]
     assert_equal "phill", client["firstname"]
     assert_equal "smith", client["lastname"]
@@ -92,18 +91,18 @@
     assert_equal "2009-01-01", client["created"]
     assert_equal "2010-04-23", client["lastlogin"]
   end
 
   def test_list_empty
-    Solusvm.config("api_id2", api_login[:key], :url => 'http://www.example.com/api')
+    @client = Solusvm::Client.new(api_id: "api_id2", api_key: api_login[:key], url: 'http://www.example.com/api')
     VCR.use_cassette "client/list" do
       assert @client.list.empty?
     end
   end
 
   def test_list_fail
-    Solusvm.config("api_id3", api_login[:key], :url => 'http://www.example.com/api')
-    VCR.use_cassette "client/list" do    
+    @client = Solusvm::Client.new(api_id: "api_id3", api_key: api_login[:key], url: 'http://www.example.com/api')
+    VCR.use_cassette "client/list" do
       assert_nil @client.list
     end
   end
-end
\ No newline at end of file
+end