Merge pull request #843 from blowmage/language-fixes

More Language Changes
googleapis · Aug 24, 2016 · a738e43 · a738e43
2 parents f7e239d + ca5a020
commit a738e43
Show file tree

Hide file tree

Showing 8 changed files with 14 additions and 8 deletions.
diff --git a/google-cloud-language/Rakefile b/google-cloud-language/Rakefile
@@ -36,6 +36,8 @@ task :acceptance, :project, :keyfile do |t, args|
   # always overwrite when running tests
   ENV["LANGUAGE_PROJECT"] = project
   ENV["LANGUAGE_KEYFILE"] = keyfile
+  ENV["STORAGE_PROJECT"] = project
+  ENV["STORAGE_KEYFILE"] = keyfile
 
   $LOAD_PATH.unshift "lib", "acceptance"
   Dir.glob("acceptance/**/*_test.rb").each { |file| require_relative file }

diff --git a/google-cloud-language/acceptance/language/html_test.rb b/google-cloud-language/acceptance/language/html_test.rb
@@ -168,7 +168,7 @@
       annotation.tokens.must_be :empty?
     end
 
-    it "runs only the sentiment feature" do
+    it "runs only the entities feature" do
       doc = language.document content, format: :html
       doc.must_be :html?
       doc.wont_be :text?

diff --git a/google-cloud-language/acceptance/language/storage/html_file_test.rb b/google-cloud-language/acceptance/language/storage/html_file_test.rb
@@ -208,7 +208,7 @@
       annotation.tokens.must_be :empty?
     end
 
-    it "runs only the sentiment feature" do
+    it "runs only the entities feature" do
       doc = language.document file, format: :html
       doc.must_be :html?
       doc.wont_be :text?

diff --git a/google-cloud-language/acceptance/language/storage/html_url_test.rb b/google-cloud-language/acceptance/language/storage/html_url_test.rb
@@ -208,7 +208,7 @@
       annotation.tokens.must_be :empty?
     end
 
-    it "runs only the sentiment feature" do
+    it "runs only the entities feature" do
       doc = language.document url, format: :html
       doc.must_be :html?
       doc.wont_be :text?

diff --git a/google-cloud-language/acceptance/language/storage/text_file_test.rb b/google-cloud-language/acceptance/language/storage/text_file_test.rb
@@ -206,7 +206,7 @@
       annotation.tokens.must_be :empty?
     end
 
-    it "runs only the sentiment feature" do
+    it "runs only the entities feature" do
       doc = language.document file, format: :text
       doc.must_be :text?
       doc.wont_be :html?

diff --git a/google-cloud-language/acceptance/language/storage/text_url_test.rb b/google-cloud-language/acceptance/language/storage/text_url_test.rb
@@ -207,7 +207,7 @@
       annotation.tokens.must_be :empty?
     end
 
-    it "runs only the sentiment feature" do
+    it "runs only the entities feature" do
       doc = language.document url, format: :text
       doc.must_be :text?
       doc.wont_be :html?

diff --git a/google-cloud-language/acceptance/language/text_test.rb b/google-cloud-language/acceptance/language/text_test.rb
@@ -202,7 +202,7 @@
       annotation.tokens.must_be :empty?
     end
 
-    it "runs only the sentiment feature" do
+    it "runs only the entities feature" do
       doc = language.document content, format: :text
       doc.must_be :text?
       doc.wont_be :html?

diff --git a/google-cloud-language/lib/google/cloud/language/service.rb b/google-cloud-language/lib/google/cloud/language/service.rb
@@ -38,7 +38,11 @@ def initialize project, credentials, host: nil, retries: nil,
           @timeout = timeout
         end
 
-        def creds
+        def channel
+          GRPC::Core::Channel.new host, nil, chan_creds
+        end
+
+        def chan_creds
           return credentials if insecure?
           GRPC::Core::ChannelCredentials.new.compose \
             GRPC::Core::CallCredentials.new credentials.client.updater_proc
@@ -48,7 +52,7 @@ def service
           return mocked_service if mocked_service
           @service ||= V1beta1::LanguageServiceApi.new(
             service_path: host,
-            chan_creds: creds,
+            channel: channel,
             timeout: timeout,
             app_name: "google-cloud-language",
             app_version: Google::Cloud::Language::VERSION)