proxy_rb 0.9.2 → 0.9.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 0bb57f101309355b205d0f087190e409c7349043
-  data.tar.gz: c34869197694d2193219db461acf8a3826f2be56
+  metadata.gz: 9799738e3d8da056c25cf08f28647b281325c60b
+  data.tar.gz: b360d5d1de85945d4a7294c0f8a2f85b67bfb82b
 SHA512:
-  metadata.gz: 9fe18b6359945971756bc5063d326d05ca304db97dc2c22e8dae2a106a0258b7854497540cbbf7096f251a6fcef65fd5b9423006ffc48c6872f30dde610cfb0b
-  data.tar.gz: 9d2bbcfa91fe09d52e9f9e72920319dc85c0f07fa66be7a3bd195487a466ce65ec49549e0ca8b7c0209ca9232b626a43adadc5193966ffcefcad6ceddedf6b68
+  metadata.gz: 4e8d66e348e805b72dca73bed0e8fe03dda126140440a733777411823d18e78f781fb3176bdce419f0b1458b9031968d4928437579d3aecf5cf962a399c06fd2
+  data.tar.gz: caaa78ed74e2ea1ce33cc3d9c8431717c64483463c335555fe8526cb4900b82e3dc4f36bbc49d8c34972b7af33d037f6586b254ac8476a4cf6dfd38d7eadfe34

data/History.md

@@ -4,6 +4,12 @@ Empty
 
 # RELEASED
 
+## [v0.9.3](https://github.com/fedux-org/proxy_rb/compare/v0.9.2...v0.9.3)
+
+* Added best practises for usage of cucumber steps
+* Refactored steps to make it possible to check for body in proxy
+* Added step to set user directly - required for best practises
+
 ## [v0.9.2](https://github.com/fedux-org/proxy_rb/compare/v0.9.1...v0.9.2)
 
 * Fixed proxy authentication for cucumber steps

data/README.md

@@ -110,6 +110,13 @@ require 'proxy_rb/cucumber'
 
 Create a file named `features/result.feature`.
 
+Those steps given by `proxy_rb` are considered to be used as low level steps
+which are called from more appropriate high level steps describing uses cases.
+Using them directly is more like unit testing. Please see
+[features/best_practises.feature](features/best_practises.feature] for some
+more examples.
+
+
 ~~~ruby
 Feature: Test the result code of a request
   Scenario: Request is allowed

data/lib/proxy_rb/credentials.rb

@@ -5,8 +5,7 @@ require 'shellwords'
 module ProxyRb
   # Hold proxy credentials
   class Credentials
-    attr_reader :user_name
-    attr_accessor :password
+    attr_accessor :user_name, :password
 
     # @param [String] user_name
     #   The user name to use for authentication against proxy

data/lib/proxy_rb/cucumber/hooks.rb

@@ -10,7 +10,7 @@ end
   resource_user
   http_response_headers
 ).each do |announcer|
-  Before "@announce-#{announcer.to_s.gsub(/_/, '-')}" do
+  Before "@announce-#{announcer.to_s.tr('_', '-')}" do
     proxy_rb.announcer.activate(announcer)
   end
 end

data/lib/proxy_rb/cucumber/steps.rb

@@ -2,11 +2,24 @@
 require 'proxy_rb/http_proxy'
 require 'proxy_rb/proxy_url_parser'
 
+Given(/^I use the user "([^"]*)" with password "([^"]*)"$/) do |user_name, password|
+  u = OpenStruct.new
+  u.name     = user_name
+  u.password = password
+
+  users << u
+end
+
 Given(/^I use the following proxies:$/) do |table|
   @proxies = table.hashes.map do |r|
-    p = ProxyRb::HttpProxy.new(ProxyRb::ProxyUrlParser.new(r[:proxy])) 
+    p = ProxyRb::HttpProxy.new(ProxyRb::ProxyUrlParser.new(r[:proxy]))
     p.credentials.password = password(p.credentials.user_name) if p.credentials.password == '<PASSWORD>'
 
+    unless users.nil? || users.empty?
+      p.credentials.user_name = users.first.name
+      p.credentials.password  = users.first.password
+    end
+
     p
   end
 end
@@ -29,18 +42,22 @@ Then(/the following requests are( not)? allowed to pass the proxy:/) do |forbidd
 end
 
 When(/^I visit "([^"]*)"$/) do |url|
-  Array(proxies.first).each { |proxy| visit url, proxy }
+  websites << url
 end
 
 When(/^I visit the following websites:$/) do |table|
-  @websites = table.hashes.map { |r| r[:url] }
+  websites.concat table.hashes.map { |r| r[:url] }
 end
 
 Then(/the (?:last response|last requested page) should( not)? contain:/) do |not_expected, content|
-  if not_expected
-    expect(page).not_to have_content content
-  else
-    expect(page).to have_content content
+  proxies.each do |proxy| 
+    visit websites.last, proxy 
+
+    if not_expected
+      expect(page).not_to have_content content
+    else
+      expect(page).to have_content content
+    end
   end
 end
 

data/lib/proxy_rb/cucumber.rb

@@ -17,6 +17,10 @@ module ProxyRb
     def websites
       @websites ||= []
     end
+
+    def users
+      @users ||= []
+    end
   end
 end
 

data/lib/proxy_rb/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 # Main Module
 module ProxyRb
-  VERSION = '0.9.2'
+  VERSION = '0.9.3'
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: proxy_rb
 version: !ruby/object:Gem::Version
-  version: 0.9.2
+  version: 0.9.3
 platform: ruby
 authors:
 - Max Meyer