test/fastly/client_test.rb in fastly-1.4.3 vs test/fastly/client_test.rb in fastly-1.5.0

@@ -1,11 +1,11 @@
-require 'test_helper'
+require_relative '../test_helper'
 
 describe Fastly::Client do
-  let(:user)        { "[e-mail]" }
-  let(:password)    { "notasecret" }
-  let(:api_key)     { "notasecreteither" }
+  let(:user)     { "[e-mail]" }
+  let(:password) { "notasecret" }
+  let(:api_key)  { "notasecreteither" }
 
   describe 'initialize' do
     it 'raises ArgumentError when no options provided' do
       assert_raises(ArgumentError) {
         Fastly::Client.new()
@@ -42,9 +42,20 @@
       stub_request(:any, /api.fastly.com/).
         to_return(body: JSON.generate(i: "dont care"), status: 200, headers: { 'Set-Cookie' => 'tasty!' })
 
       client = Fastly::Client.new(user: user, password: pass)
       assert_equal "tasty!", client.cookie
+    end
+
+    it 'raises an Error if username is used in place of user as an option' do
+      stub_request(:any, /api.fastly.com/).
+        to_return(body: JSON.generate(i: "dont care"), status: 200, headers: { 'Set-Cookie' => 'tasty!' })
+
+      assert_raises(ArgumentError) { Fastly.new(username: user, password: pass) }
+
+      Fastly.new(user: user, password: pass)
+      Fastly.new(api_key: api_key)
+      Fastly.new(api_key: api_key, user: user, password: pass)
     end
   end
 
   describe 'get' do
     let(:client) { Fastly::Client.new(api_key: api_key) }