Merge branch 'master' into dont-leak-constants

Author: mamoonraja

.bumpversion.cfg

@@ -1,5 +1,5 @@
 [bumpversion]
-current_version = 0.5.0
+current_version = 0.5.1
 commit = True
 message = [skip ci] Bump version: {current_version} -> {new_version}
 

.rubocop.yml

@@ -1584,6 +1584,9 @@ Lint/UnusedMethodArgument:
 Lint/Void:
   CheckForMethodsWithNoSideEffects: false
 
+Rails:
+  Enabled: false
+
 #################### Performance ###########################
 
 Performance/DoubleStartEndWith:

lib/ibm_watson/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module IBMWatson
-  VERSION = "0.5.0"
+  VERSION = "0.5.1"
 end

test/integration/test_assistant_v1.rb

@@ -3,7 +3,7 @@
 require_relative("./../test_helper.rb")
 SimpleCov.command_name "test:integration"
 
-unless ENV["ASSISTANT_USERNAME"].nil? || ENV["ASSISTANT_PASSWORD"].nil?
+if !ENV["ASSISTANT_USERNAME"].nil? && !ENV["ASSISTANT_PASSWORD"].nil?
   # Integration tests for the Watson Assistant V1 Service
   class AssistantV1Test < Minitest::Test
     def test_create_update_delete_workspace
@@ -652,4 +652,10 @@ def test_delete_user_data
       assert(service_response.nil?)
     end
   end
+else
+  class AssistantV1Test < Minitest::Test
+    def test_missing_credentials_skip_integration
+      skip "Skip assistant integration tests because credentials have not been provided"
+    end
+  end
 end

test/integration/test_discovery_v1.rb

@@ -3,7 +3,7 @@
 require_relative("./../test_helper.rb")
 require("minitest/hooks/test")
 
-unless ENV["DISCOVERY_USERNAME"].nil? || ENV["DISCOVERY_PASSWORD"].nil?
+if !ENV["DISCOVERY_USERNAME"].nil? && !ENV["DISCOVERY_PASSWORD"].nil?
   # Integration tests for the Discovery V1 Service
   class DiscoveryV1Test < Minitest::Test
     include Minitest::Hooks
@@ -208,4 +208,10 @@ def test_list_credentials
       refute(credentials.nil?)
     end
   end
+else
+  class DiscoveryV1Test < Minitest::Test
+    def test_missing_credentials_skip_integration
+      skip "Skip discovery integration tests because credentials have not been provided"
+    end
+  end
 end

test/integration/test_iam_assistant_v1.rb

@@ -2,7 +2,7 @@
 
 require_relative("./../test_helper.rb")
 
-unless ENV["ASSISTANT_IAM_URL"].nil? || ENV["ASSISTANT_IAM_APIKEY"].nil?
+if !ENV["ASSISTANT_IAM_URL"].nil? && !ENV["ASSISTANT_IAM_APIKEY"].nil?
   # Integration tests for the Watson Assistant V1 Service
   class IAMAssistantV1Test < Minitest::Test
     def test_create_update_delete_workspace
@@ -715,4 +715,10 @@ def test_receive_error
       assert(error_received)
     end
   end
+else
+  class IAMAssistantV1Test < Minitest::Test
+    def test_missing_credentials_skip_integration
+      skip "Skip iam assistant integration tests because credentials have not been provided"
+    end
+  end
 end

test/integration/test_language_translator_v3.rb

@@ -4,7 +4,7 @@
 require_relative("./../test_helper.rb")
 require("minitest/hooks/test")
 
-unless ENV["LANGUAGE_TRANSLATOR_V3_USERNAME"].nil? || ENV["LANGUAGE_TRANSLATOR_V3_PASSWORD"].nil?
+if !ENV["LANGUAGE_TRANSLATOR_V3_USERNAME"].nil? && !ENV["LANGUAGE_TRANSLATOR_V3_PASSWORD"].nil?
   # Integration tests for the Language Translator V3 Service
   class LanguageTranslatorV3Test < Minitest::Test
     include Minitest::Hooks
@@ -80,4 +80,10 @@ def test_create_delete_model
       assert_equal("OK", service_response["status"])
     end
   end
+else
+  class LanguageTranslatorV3Test < Minitest::Test
+    def test_missing_credentials_skip_integration
+      skip "Skip language translator integration tests because credentials have not been provided"
+    end
+  end
 end

test/integration/test_natural_language_classifier_v1.rb

@@ -4,7 +4,7 @@
 require_relative("./../test_helper.rb")
 require("minitest/hooks/test")
 
-unless ENV["NATURAL_LANGUAGE_CLASSIFIER_USERNAME"].nil? || ENV["NATURAL_LANGUAGE_CLASSIFIER_PASSWORD"].nil?
+if !ENV["NATURAL_LANGUAGE_CLASSIFIER_USERNAME"].nil? && !ENV["NATURAL_LANGUAGE_CLASSIFIER_PASSWORD"].nil?
   # Integration tests for the Natural Language Classifier V1 Service
   class NaturalLanguageClassifierV1Test < Minitest::Test
     include Minitest::Hooks
@@ -68,4 +68,10 @@ def test_classify_text
       )
     end
   end
+else
+  class NaturalLanguageClassifierV1Test < Minitest::Test
+    def test_missing_credentials_skip_integration
+      skip "Skip natural language classifier integration tests because credentials have not been provided"
+    end
+  end
 end

test/integration/test_natural_language_understanding_v1.rb

@@ -3,7 +3,7 @@
 require("json")
 require_relative("./../test_helper.rb")
 
-unless ENV["NATURAL_LANGUAGE_UNDERSTANDING_USERNAME"].nil? || ENV["NATURAL_LANGUAGE_UNDERSTANDING_PASSWORD"].nil?
+if !ENV["NATURAL_LANGUAGE_UNDERSTANDING_USERNAME"].nil? && !ENV["NATURAL_LANGUAGE_UNDERSTANDING_PASSWORD"].nil?
   # Integration tests for the Natural Language Understanding V1 Service
   class NaturalLanguageUnderstandingV1Test < Minitest::Test
     def test_text_analyze
@@ -98,4 +98,10 @@ def test_list_models
       assert((200..299).cover?(service_response.status))
     end
   end
+else
+  class NaturalLanguageUnderstandingV1Test < Minitest::Test
+    def test_missing_credentials_skip_integration
+      skip "Skip natural language understanding integration tests because credentials have not been provided"
+    end
+  end
 end

test/integration/test_personality_insights_v3.rb

@@ -3,7 +3,7 @@
 require("json")
 require_relative("./../test_helper.rb")
 
-unless ENV["PERSONALITY_INSIGHTS_USERNAME"].nil? || ENV["PERSONALITY_INSIGHTS_PASSWORD"].nil?
+if !ENV["PERSONALITY_INSIGHTS_USERNAME"].nil? && !ENV["PERSONALITY_INSIGHTS_PASSWORD"].nil?
   # Integration tests for the Personality Insights V3 Service
   class PersonalityInsightsV3Test < Minitest::Test
     def test_plain_to_json
@@ -94,4 +94,10 @@ def test_plain_to_json_es
       assert((200..299).cover?(service_response.status))
     end
   end
+else
+  class PersonalityInsightsV3Test < Minitest::Test
+    def test_missing_credentials_skip_integration
+      skip "Skip personality insights integration tests because credentials have not been provided"
+    end
+  end
 end