Fix unit tests.

Author: brendandburns

kubernetes/spec/config/incluster_config_spec.rb

@@ -14,6 +14,7 @@
 
 require 'spec_helper'
 require 'config/matchers'
+require 'helpers/file_fixtures'
 
 require 'kubernetes/config/incluster_config'
 
@@ -27,16 +28,16 @@
           Kubernetes::InClusterConfig::SERVICE_HOST_ENV_NAME => 'localhost',
           Kubernetes::InClusterConfig::SERVICE_PORT_ENV_NAME => '443',
         })
-        c.instance_variable_set(:@ca_cert, file_fixture('certs/ca.crt').to_s)
-        c.instance_variable_set(:@token_file, file_fixture('tokens/token').to_s)
+        c.instance_variable_set(:@ca_cert, Kubernetes::Testing::file_fixture('certs/ca.crt').to_s)
+        c.instance_variable_set(:@token_file, Kubernetes::Testing::file_fixture('tokens/token').to_s)
       end
     end
 
     it 'should configure configuration' do
       expected = Kubernetes::Configuration.new do |c|
         c.scheme = 'https'
         c.host = 'localhost:443'
-        c.ssl_ca_cert = file_fixture('certs/ca.crt').to_s
+        c.ssl_ca_cert = Kubernetes::Testing::file_fixture('certs/ca.crt').to_s
         c.api_key['authorization'] = 'Bearer token1'
       end
       actual = Kubernetes::Configuration.new
@@ -53,8 +54,8 @@
           Kubernetes::InClusterConfig::SERVICE_HOST_ENV_NAME => 'localhost',
           Kubernetes::InClusterConfig::SERVICE_PORT_ENV_NAME => '443',
         })
-        c.instance_variable_set(:@ca_cert, file_fixture('certs/ca.crt').to_s)
-        c.instance_variable_set(:@token_file, file_fixture('tokens/token').to_s)
+        c.instance_variable_set(:@ca_cert, Kubernetes::Testing::file_fixture('certs/ca.crt').to_s)
+        c.instance_variable_set(:@token_file, Kubernetes::Testing::file_fixture('tokens/token').to_s)
       end
     end
 

kubernetes/spec/config/kube_config_spec.rb

@@ -16,12 +16,13 @@
 require 'spec_helper'
 require 'config/matchers'
 require 'fixtures/config/kube_config_hash'
+require 'helpers/file_fixtures'
 
 require 'kubernetes/config/kube_config'
 
 
 describe Kubernetes::KubeConfig do
-  let(:kube_config) { Kubernetes::KubeConfig.new(file_fixture('config/config').to_s, TEST_KUBE_CONFIG) }
+  let(:kube_config) { Kubernetes::KubeConfig.new(Kubernetes::Testing::file_fixture('config/config').to_s, TEST_KUBE_CONFIG) }
 
   context '#configure' do
     context 'if non user context is given' do
@@ -42,9 +43,9 @@
         expected = Kubernetes::Configuration.new do |c|
           c.scheme = 'https'
           c.host = 'test-host:443'
-          c.ssl_ca_cert = file_fixture('certs/ca.crt').to_s
-          c.cert_file = file_fixture('certs/client.crt').to_s
-          c.key_file = file_fixture('certs/client.key').to_s
+          c.ssl_ca_cert = Kubernetes::Testing::file_fixture('certs/ca.crt').to_s
+          c.cert_file = Kubernetes::Testing::file_fixture('certs/client.crt').to_s
+          c.key_file = Kubernetes::Testing::file_fixture('certs/client.key').to_s
         end
         actual = Kubernetes::Configuration.new
 
@@ -58,7 +59,7 @@
         expected = Kubernetes::Configuration.new do |c|
           c.scheme = 'https'
           c.host = 'test-host:443'
-          c.ssl_ca_cert = file_fixture('certs/ca.crt').to_s
+          c.ssl_ca_cert = Kubernetes::Testing::file_fixture('certs/ca.crt').to_s
           c.api_key['authorization'] = "Bearer #{TEST_DATA_BASE64}"
         end
         actual = Kubernetes::Configuration.new
@@ -71,15 +72,15 @@
 
   context '#config' do
     context 'if config hash is not given when it is initialized' do
-      let(:kube_config) { Kubernetes::KubeConfig.new(file_fixture('config/empty').to_s) }
+      let(:kube_config) { Kubernetes::KubeConfig.new(Kubernetes::Testing::file_fixture('config/empty').to_s) }
       it 'should load config' do
         expect(kube_config.config).to eq({})
       end
     end
 
     context 'if config hash is given when it is initialized' do
       let(:given_hash) { {given: 'hash'} }
-      let(:kube_config) { Kubernetes::KubeConfig.new(file_fixture('config/empty').to_s, given_hash) }
+      let(:kube_config) { Kubernetes::KubeConfig.new(Kubernetes::Testing::file_fixture('config/empty').to_s, given_hash) }
 
       it 'should not load config' do
         expect(kube_config.config).to eq(given_hash)

kubernetes/spec/fixtures/config/kube_config_hash.rb

@@ -13,6 +13,7 @@
 # limitations under the License.
 
 require 'base64'
+require 'helpers/file_fixtures'
 
 
 TEST_TOKEN_FILE = Kubernetes::Testing.file_fixture('tokens/token')

kubernetes/spec/helpers/file_fixtures.rb

@@ -11,6 +11,8 @@
 # WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
 # See the License for the specific language governing permissions and
 
+require 'pathname'
+
 module Kubernetes
   module Testing
     module FileFixtures

kubernetes/spec/utils_spec.rb

@@ -15,6 +15,7 @@
 require 'spec_helper'
 require 'config/matchers'
 require 'fixtures/config/kube_config_hash'
+require 'helpers/file_fixtures'
 
 require 'kubernetes/utils'
 
@@ -28,8 +29,8 @@
           Kubernetes::InClusterConfig::SERVICE_HOST_ENV_NAME => 'localhost',
           Kubernetes::InClusterConfig::SERVICE_PORT_ENV_NAME => '443',
         })
-        c.instance_variable_set(:@ca_cert, file_fixture('certs/ca.crt').to_s)
-        c.instance_variable_set(:@token_file, file_fixture('tokens/token').to_s)
+        c.instance_variable_set(:@ca_cert, Kubernetes::Testing::file_fixture('certs/ca.crt').to_s)
+        c.instance_variable_set(:@token_file, Kubernetes::Testing::file_fixture('tokens/token').to_s)
       end
     end
 
@@ -38,7 +39,7 @@
       expected = Kubernetes::Configuration.new do |c|
         c.scheme = 'https'
         c.host = 'localhost:443'
-        c.ssl_ca_cert = file_fixture('certs/ca.crt').to_s
+        c.ssl_ca_cert = Kubernetes::Testing::file_fixture('certs/ca.crt').to_s
         c.api_key['authorization'] = 'Bearer token1'
       end
       actual = Kubernetes::Configuration.new
@@ -49,17 +50,17 @@
   end
 
   describe '.load_kube_config' do
-    let(:kube_config) { Kubernetes::KubeConfig.new(file_fixture('config/config').to_s, TEST_KUBE_CONFIG) }
+    let(:kube_config) { Kubernetes::KubeConfig.new(Kubernetes::Testing::file_fixture('config/config').to_s, TEST_KUBE_CONFIG) }
 
     it 'should configure client configuration from kube_config' do
       kubeconfig_path = 'kubeconfig/path'
       allow(Kubernetes::KubeConfig).to receive(:new).with(kubeconfig_path).and_return(kube_config)
       expected = Kubernetes::Configuration.new do |c|
         c.scheme = 'https'
         c.host = 'test-host:443'
-        c.ssl_ca_cert = file_fixture('certs/ca.crt').to_s
-        c.cert_file = file_fixture('certs/client.crt').to_s
-        c.key_file = file_fixture('certs/client.key').to_s
+        c.ssl_ca_cert = Kubernetes::Testing::file_fixture('certs/ca.crt').to_s
+        c.cert_file = Kubernetes::Testing::file_fixture('certs/client.crt').to_s
+        c.key_file = Kubernetes::Testing::file_fixture('certs/client.key').to_s
       end
       actual = Kubernetes::Configuration.new