Merge pull request #162 from docusign/fix/fixes-for-new-selenium-tests

Fix error display for admin examples and add webforms gem to a Gemfile

Author: InbarGazit

Gemfile

@@ -74,6 +74,7 @@ gem 'docusign_esign', '~> 4.0.0.rc1'
 gem 'docusign_maestro', '~> 2.0.0.rc1'
 gem 'docusign_monitor', '~> 1.2.0'
 gem 'docusign_rooms', '~> 1.3.0'
+gem 'docusign_webforms', '~> 1.0.0'
 gem 'omniauth-oauth2', '~> 1.8.0'
 gem 'omniauth-rails_csrf_protection'
 

Gemfile.lock

@@ -141,6 +141,11 @@ GEM
       json (~> 2.1, >= 2.1.0)
       jwt (~> 2.2, >= 2.2.1)
       typhoeus (~> 1.0, >= 1.0.1)
+    docusign_webforms (1.0.0)
+      addressable (~> 2.7, >= 2.7.0)
+      json (~> 2.1, >= 2.1.0)
+      jwt (~> 2.2, >= 2.2.1)
+      typhoeus (~> 1.0, >= 1.0.1)
     drb (2.2.1)
     erubi (1.13.0)
     ethon (0.16.0)
@@ -390,6 +395,7 @@ DEPENDENCIES
   docusign_maestro (~> 2.0.0.rc1)
   docusign_monitor (~> 1.2.0)
   docusign_rooms (~> 1.3.0)
+  docusign_webforms (~> 1.0.0)
   jbuilder (~> 2.11.5)
   listen (~> 3.9.0)
   matrix (~> 0.4.2)

app/controllers/eg_controller.rb

@@ -92,7 +92,7 @@ def check_auth(api)
   def handle_error(e)
     error = JSON.parse e.response_body
     @error_code = e.code || error['errorCode']
-    @error_message = error['error_description'] || error['message']
+    @error_message = error['error_description'] || error['message'] || error['error']
     render 'ds_common/error'
   end