From e31c68d43fe4dd11de1d3cac1e2ff506d5cb18ae Mon Sep 17 00:00:00 2001 From: Artur Beljajev Date: Wed, 25 Jan 2017 05:11:31 +0200 Subject: [PATCH] Add EPP response code rspec matcher #355 --- spec/rails_helper.rb | 8 +++++ .../epp/domain/delete/discarded_spec.rb | 8 ++--- .../epp/domain/transfer/discarded_spec.rb | 8 ++--- .../epp/domain/update/discarded_spec.rb | 8 ++--- spec/support/matchers/epp/code.rb | 35 +++++++++++++++++++ spec/support/requests/epp_helpers.rb | 7 ++++ 6 files changed, 56 insertions(+), 18 deletions(-) create mode 100644 spec/support/matchers/epp/code.rb create mode 100644 spec/support/requests/epp_helpers.rb diff --git a/spec/rails_helper.rb b/spec/rails_helper.rb index 402db389d..bfe87211b 100644 --- a/spec/rails_helper.rb +++ b/spec/rails_helper.rb @@ -6,6 +6,7 @@ require 'capybara/poltergeist' require 'paper_trail/frameworks/rspec' require 'money-rails/test_helpers' require 'support/requests/session_helpers' +require 'support/requests/epp_helpers' require 'support/features/session_helpers' if ENV['ROBOT'] @@ -15,6 +16,7 @@ end require 'support/matchers/alias_attribute' require 'support/matchers/active_job' +require 'support/matchers/epp/code' require 'support/capybara' require 'support/factory_girl' require 'support/database_cleaner' @@ -30,6 +32,8 @@ RSpec.configure do |config| config.include Features::SessionHelpers, type: :feature config.include AbstractController::Translation, type: :feature + config.include Requests::EPPHelpers, epp: true + config.define_derived_metadata(file_path: %r[/spec/features/]) do |metadata| metadata[:db] = true if metadata[:db].nil? end @@ -46,6 +50,10 @@ RSpec.configure do |config| metadata[:db] = true if metadata[:db].nil? end + config.define_derived_metadata(file_path: %r[/spec/requests/epp/]) do |metadata| + metadata[:epp] = true if metadata[:epp].nil? + end + config.define_derived_metadata(file_path: %r[/spec/api/]) do |metadata| metadata[:type] = :request end diff --git a/spec/requests/epp/domain/delete/discarded_spec.rb b/spec/requests/epp/domain/delete/discarded_spec.rb index f136e0696..99ec59267 100644 --- a/spec/requests/epp/domain/delete/discarded_spec.rb +++ b/spec/requests/epp/domain/delete/discarded_spec.rb @@ -20,10 +20,6 @@ RSpec.describe 'EPP domain:delete' do XML } - subject(:response_xml) { Nokogiri::XML(response.body) } - subject(:response_code) { response_xml.xpath('//xmlns:result').first['code'] } - subject(:response_description) { response_xml.css('result msg').text } - before :example do sign_in_to_epp_area end @@ -33,7 +29,7 @@ RSpec.describe 'EPP domain:delete' do it 'returns epp code of 1001' do post '/epp/command/delete', frame: request_xml - expect(response_code).to eq('1001'), "Expected EPP code of 1001, got #{response_code} (#{response_description})" + expect(response).to have_code_of(1001) end end @@ -42,7 +38,7 @@ RSpec.describe 'EPP domain:delete' do it 'returns epp code of 2105' do post '/epp/command/delete', frame: request_xml - expect(response_code).to eq('2105'), "Expected EPP code of 2105, got #{response_code} (#{response_description})" + expect(response).to have_code_of(2105) end end end diff --git a/spec/requests/epp/domain/transfer/discarded_spec.rb b/spec/requests/epp/domain/transfer/discarded_spec.rb index 045e3cd2f..51f65c641 100644 --- a/spec/requests/epp/domain/transfer/discarded_spec.rb +++ b/spec/requests/epp/domain/transfer/discarded_spec.rb @@ -18,10 +18,6 @@ RSpec.describe 'EPP domain:transfer' do XML } - subject(:response_xml) { Nokogiri::XML(response.body) } - subject(:response_code) { response_xml.xpath('//xmlns:result').first['code'] } - subject(:response_description) { response_xml.css('result msg').text } - before :example do sign_in_to_epp_area end @@ -31,7 +27,7 @@ RSpec.describe 'EPP domain:transfer' do it 'returns epp code of 1000' do post '/epp/command/transfer', frame: request_xml - expect(response_code).to eq('1000'), "Expected EPP code of 1000, got #{response_code} (#{response_description})" + expect(response).to have_code_of(1000) end end @@ -40,7 +36,7 @@ RSpec.describe 'EPP domain:transfer' do it 'returns epp code of 2105' do post '/epp/command/transfer', frame: request_xml - expect(response_code).to eq('2105'), "Expected EPP code of 2105, got #{response_code} (#{response_description})" + expect(response).to have_code_of(2105) end end end diff --git a/spec/requests/epp/domain/update/discarded_spec.rb b/spec/requests/epp/domain/update/discarded_spec.rb index c1061a95f..14ff1c743 100644 --- a/spec/requests/epp/domain/update/discarded_spec.rb +++ b/spec/requests/epp/domain/update/discarded_spec.rb @@ -15,10 +15,6 @@ RSpec.describe 'EPP domain:update' do XML } - subject(:response_xml) { Nokogiri::XML(response.body) } - subject(:response_code) { response_xml.xpath('//xmlns:result').first['code'] } - subject(:response_description) { response_xml.css('result msg').text } - before :example do sign_in_to_epp_area end @@ -28,7 +24,7 @@ RSpec.describe 'EPP domain:update' do it 'returns epp code of 1000' do post '/epp/command/update', frame: request_xml - expect(response_code).to eq('1000'), "Expected EPP code of 1000, got #{response_code} (#{response_description})" + expect(response).to have_code_of(1000) end end @@ -37,7 +33,7 @@ RSpec.describe 'EPP domain:update' do it 'returns epp code of 2105' do post '/epp/command/update', frame: request_xml - expect(response_code).to eq('2105'), "Expected EPP code of 2105, got #{response_code} (#{response_description})" + expect(response).to have_code_of(2105) end end end diff --git a/spec/support/matchers/epp/code.rb b/spec/support/matchers/epp/code.rb new file mode 100644 index 000000000..db79488b3 --- /dev/null +++ b/spec/support/matchers/epp/code.rb @@ -0,0 +1,35 @@ +module Matchers + module EPP + class Code + def initialize(expected) + @expected = expected + end + + def matches?(response) + @xml = response.body + actual == expected + end + + def failure_message + "Expected EPP code of #{expected}, got #{actual} (#{description})" + end + + private + + attr_reader :xml + attr_reader :expected + + def actual + xml_document.xpath('//xmlns:result').first['code'].to_i + end + + def description + xml_document.css('result msg').text + end + + def xml_document + @xml_document ||= Nokogiri::XML(xml) + end + end + end +end diff --git a/spec/support/requests/epp_helpers.rb b/spec/support/requests/epp_helpers.rb new file mode 100644 index 000000000..1372ae779 --- /dev/null +++ b/spec/support/requests/epp_helpers.rb @@ -0,0 +1,7 @@ +module Requests + module EPPHelpers + def have_code_of(*args) + Matchers::EPP::Code.new(*args) + end + end +end