Skip to content

Commit

Permalink
avoid conflict with http gem (openshift#2112)
Browse files Browse the repository at this point in the history
* add test for ERB expressions in loop steps

* avoid interference with http gem
  • Loading branch information
akostadinov authored Jun 25, 2021
1 parent 786d866 commit f484135
Show file tree
Hide file tree
Showing 15 changed files with 20 additions and 12 deletions.
1 change: 1 addition & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -11,5 +11,6 @@ junit-report/
vendor/
.byebug_history
.tool-versions
report-portal.yml
/tmp
*.iml
7 changes: 7 additions & 0 deletions features/test/transformations.feature
Original file line number Diff line number Diff line change
Expand Up @@ -13,3 +13,10 @@ Feature: test some transformations
Examples:
| message |
| <%= "example " + "message" %> |

Scenario: mistaken nested ERB expression still should not fail
Given the expression should be true> cb.test = ["1", "2", "3"]
When I repeat the following steps for each :item in cb.test:
"""
Then I log the message> an item in "<%= cb.test %>: #{cb.item}"
"""
File renamed without changes.
2 changes: 1 addition & 1 deletion lib/environment.rb
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
require 'admin_credentials'
require 'user_manager'
require 'host'
require 'http'
require 'cucuhttp'
require 'net'
require 'rest'
require 'openshift/node'
Expand Down
2 changes: 1 addition & 1 deletion lib/launchers/alicloud.rb
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@

require 'collections'
require 'common'
require 'http'
require 'cucuhttp'

module BushSlicer
class Alicloud
Expand Down
2 changes: 1 addition & 1 deletion lib/launchers/o_c_m_cluster.rb
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@
require 'tmpdir'
require 'git'
require 'os'
require 'http'
require 'cucuhttp'

module BushSlicer
class OCMCluster
Expand Down
2 changes: 1 addition & 1 deletion lib/launchers/openstack.rb
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@

require 'common'
require 'host'
require 'http'
require 'cucuhttp'
require 'net'
require 'thread'

Expand Down
2 changes: 1 addition & 1 deletion lib/login.rb
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
require 'oga'
require 'uri'

require 'http'
require 'cucuhttp'

module BushSlicer
# this file hosts necessary logic to login into OpenShift via username and
Expand Down
2 changes: 1 addition & 1 deletion lib/ownthat.rb
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@

require 'common'
require 'collections'
require 'http'
require 'cucuhttp'

module BushSlicer
# let you operate a git repo
Expand Down
2 changes: 1 addition & 1 deletion lib/platform/master_service.rb
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
require 'http'
require 'cucuhttp'

module BushSlicer
module Platform
Expand Down
2 changes: 1 addition & 1 deletion lib/polarshift/request.rb
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
# frozen_string_literal: true

require 'http'
require 'cucuhttp'

module BushSlicer
module PolarShift
Expand Down
2 changes: 1 addition & 1 deletion lib/rest_helper.rb
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
require 'http'
require 'cucuhttp'
require 'json'
require 'yaml'

Expand Down
2 changes: 1 addition & 1 deletion tools/aws.rb
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@

require 'collections'
require 'common'
require 'http'
require 'cucuhttp'

module BushSlicer
class AWSCli
Expand Down
2 changes: 1 addition & 1 deletion tools/cloud_usage.rb
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@

require 'collections'
require 'common'
require 'http'
require 'cucuhttp'
require 'thread'
require 'jenkins_api_client'
require 'text-table'
Expand Down
2 changes: 1 addition & 1 deletion tools/launch_instance.rb
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@

require 'collections'
require 'common'
require 'http'
require 'cucuhttp'

require 'launchers/cloud_helper'

Expand Down

0 comments on commit f484135

Please sign in to comment.