govuk_ab_testing 2.4.1 → 2.4.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA1:
-  metadata.gz: '09346724d0fd9301ab185c6b7fab44652aafb5d8'
-  data.tar.gz: d5abd3933fec2bf06c63b37f24aa4f0cb5426af7
+SHA256:
+  metadata.gz: cf9c70a0d36f4d97dec173bfc21738a3266700997a1af70cf3e5fac2b654c313
+  data.tar.gz: 7d63ce7fe82da0f11076b29498a6188691ee765bad005805bfecdea1fc022894
 SHA512:
-  metadata.gz: 583ec0309596a8c24fb09e0df57f28850bfac7e6a6fffa77ce629cb37f1fa0af0a99384580d90c8889ac69b5c46c54c61a4e937926dab8947592673656ec4f13
-  data.tar.gz: 0ebf9d9b58ac077a245c657d696b314dda92e5d618cc48dfea28881a16fb316d7f23833d0092f232eb526e72038d49b6baf62b355dee7f5f453301afd992b8a4
+  metadata.gz: 59ca9f4101ddea9d142c492052ceedc08af2a29e35601a25afd6e057e976ab4e7745ca9dac4b27156210122314df78da84ee4d42c84fd09fef32ec56a9017ae7
+  data.tar.gz: 9543b01d05c4e12ed4b8c0c029b3c5ff2e313b283541b47cdef0d2135c5273938d5cdcb5304981320e58a99a2399d92749729f2fc76680bbecfca60c6e938fab

data/.rubocop.yml

@@ -1,2 +1,7 @@
-AllCops:
-  TargetRubyVersion: 2.3
+inherit_gem:
+  rubocop-govuk:
+    - config/default.yml
+
+inherit_mode:
+  merge:
+    - Exclude

data/.ruby-version

@@ -1 +1 @@
-2.3.1
+2.6.6

data/CHANGELOG.md

@@ -1,3 +1,8 @@
+## 2.4.2
+
+* Updated gem dependencies and development ruby version to 2.6.6
+* Fixed new rubocop violations
+
 ## 2.4.1
 
 * Add extra validation to ActiveSupport assertions to help debug test failures.

data/Gemfile

@@ -1,4 +1,4 @@
-source 'https://rubygems.org'
+source "https://rubygems.org"
 
 # Specify your gem's dependencies in govuk_ab_testing.gemspec
 gemspec

data/Jenkinsfile

@@ -1,6 +1,7 @@
 #!/usr/bin/env groovy
 
+library("govuk")
+
 node {
-  def govuk = load '/var/lib/jenkins/groovy_scripts/govuk_jenkinslib.groovy'
   govuk.buildProject()
 }

data/Rakefile

@@ -1,13 +1,11 @@
 require "bundler/gem_tasks"
 require "rspec/core/rake_task"
-require "gem_publisher"
+require "rubocop/rake_task"
 
+RuboCop::RakeTask.new
 RSpec::Core::RakeTask.new(:spec)
 
-task :default => :spec
+desc "Linting for Ruby"
+task lint: :rubocop
 
-desc "Publish gem to RubyGems"
-task :publish_gem do |_t|
-  published_gem = GemPublisher.publish_if_updated("govuk_ab_testing.gemspec", :rubygems)
-  puts "Published #{published_gem}" if published_gem
-end
+task default: %i[lint spec]

data/govuk_ab_testing.gemspec

@@ -1,7 +1,6 @@
-# coding: utf-8
-lib = File.expand_path('../lib', __FILE__)
+lib = File.expand_path("lib", __dir__)
 $LOAD_PATH.unshift(lib) unless $LOAD_PATH.include?(lib)
-require 'govuk_ab_testing/version'
+require "govuk_ab_testing/version"
 
 Gem::Specification.new do |spec|
   spec.name          = "govuk_ab_testing"
@@ -9,8 +8,8 @@ Gem::Specification.new do |spec|
   spec.authors       = ["GOV.UK Dev"]
   spec.email         = ["govuk-dev@digital.cabinet-office.gov.uk"]
 
-  spec.summary       = %q{Gem to help with A/B testing on the GOV.UK platform}
-  spec.description   = %q{Gem to help with A/B testing on the GOV.UK platform}
+  spec.summary       = "Gem to help with A/B testing on the GOV.UK platform"
+  spec.description   = "Gem to help with A/B testing on the GOV.UK platform"
   spec.homepage      = "https://github.com/alphagov/govuk_ab_testing"
   spec.license       = "MIT"
 
@@ -19,11 +18,10 @@ Gem::Specification.new do |spec|
   end
   spec.bindir        = "exe"
   spec.executables   = spec.files.grep(%r{^exe/}) { |f| File.basename(f) }
-  spec.require_paths = ["lib"]
+  spec.require_paths = %w[lib]
 
-  spec.add_development_dependency "rake", "~> 10.0"
-  spec.add_development_dependency "rspec", "~> 3.0"
-  spec.add_development_dependency "govuk-lint", "~> 1.2.1"
-  spec.add_development_dependency "yard", "~> 0.8"
-  spec.add_development_dependency "gem_publisher", "~> 1.5.0"
+  spec.add_development_dependency "rake"
+  spec.add_development_dependency "rspec"
+  spec.add_development_dependency "rubocop-govuk"
+  spec.add_development_dependency "yard"
 end

data/lib/govuk_ab_testing.rb

@@ -1,15 +1,15 @@
-require 'govuk_ab_testing/version'
-require 'govuk_ab_testing/configuration'
-require 'govuk_ab_testing/requested_variant'
-require 'govuk_ab_testing/ab_test'
-require 'govuk_ab_testing/minitest_assertions'
-require 'govuk_ab_testing/rspec_assertions'
-require 'govuk_ab_testing/abstract_helpers'
-require 'govuk_ab_testing/minitest_helpers'
-require 'govuk_ab_testing/rspec_helpers'
-require 'govuk_ab_testing/acceptance_tests/meta_tag'
-require 'govuk_ab_testing/acceptance_tests/capybara'
-require 'govuk_ab_testing/acceptance_tests/active_support'
+require "govuk_ab_testing/version"
+require "govuk_ab_testing/configuration"
+require "govuk_ab_testing/requested_variant"
+require "govuk_ab_testing/ab_test"
+require "govuk_ab_testing/minitest_assertions"
+require "govuk_ab_testing/rspec_assertions"
+require "govuk_ab_testing/abstract_helpers"
+require "govuk_ab_testing/minitest_helpers"
+require "govuk_ab_testing/rspec_helpers"
+require "govuk_ab_testing/acceptance_tests/meta_tag"
+require "govuk_ab_testing/acceptance_tests/capybara"
+require "govuk_ab_testing/acceptance_tests/active_support"
 
 module GovukAbTesting
   ANALYTICS_META_TAG_SELECTOR = "meta[name='govuk:ab-test']".freeze

data/lib/govuk_ab_testing/ab_test.rb

@@ -13,7 +13,7 @@ module GovukAbTesting
     # @param allowed_variants [Array] an array of Strings representing the
     # possible variants
     # @param control_variant [String] the control variant (typically 'A')
-    def initialize(ab_test_name, dimension:, allowed_variants: %w(A B), control_variant: 'A')
+    def initialize(ab_test_name, dimension:, allowed_variants: %w[A B], control_variant: "A")
       @ab_test_name = ab_test_name
       @dimension = dimension
       @allowed_variants = allowed_variants

data/lib/govuk_ab_testing/abstract_helpers.rb

@@ -31,7 +31,7 @@ module GovukAbTesting
       assert_contains_substring(
         string: vary_header_value,
         substring: ab_test.response_header,
-        error_message: <<-ERROR
+        error_message: <<-ERROR,
           The 'Vary' header is not being set for the '#{ab_test.name}' A/B test.
           You will need to use GovukAbTesting::RequestedVariant#configure_response in your controller:
 
@@ -46,7 +46,7 @@ module GovukAbTesting
       assert_does_not_contain_substring(
         string: vary_header,
         substring: ab_test_name,
-        error_message: <<-ERROR
+        error_message: <<-ERROR,
           The 'Vary' header is being set by A/B test '#{ab_test_name}' on a page that should not be modified
           by the A/B test. Check for incorrect usage of GovukAbTesting::RequestedVariant#configure_response
           in your controller.
@@ -63,7 +63,7 @@ module GovukAbTesting
 
       assert_is_empty(
         enumerable: ab_test_meta_tags,
-        error_message: <<-ERROR
+        error_message: <<-ERROR,
           Found the '#{ab_test_name}' A/B testing meta tag on a page that should not be modified by
           the A/B test.
 
@@ -81,7 +81,7 @@ module GovukAbTesting
       assert_has_size(
         enumerable: ab_test_meta_tags,
         size: 1,
-        error_message: <<-ERROR
+        error_message: <<-ERROR,
           Incorrect number of analytics meta tags on the page for A/B test '#{ab_test.name}'.
           You may need to check usage of GovukAbTesting::RequestedVariant#analytics_meta_tag in your template(s):
 
@@ -96,7 +96,7 @@ module GovukAbTesting
       assert_is_equal(
         expected: expected_metatag_content,
         actual: meta_tag.content,
-        error_message: <<-ERROR
+        error_message: <<-ERROR,
           The analytics meta tag content for A/B test '#{ab_test.name}' does not match the expected value.
           You may need to use GovukAbTesting::RequestedVariant#analytics_meta_tag in your template(s):
 
@@ -107,7 +107,7 @@ module GovukAbTesting
 
       assert_not_blank(
         string: meta_tag.dimension,
-        error_message: <<-ERROR
+        error_message: <<-ERROR,
           The meta tag dimension for the '#{ab_test_name}' A/B test is blank.
         ERROR
       )
@@ -116,7 +116,7 @@ module GovukAbTesting
         assert_is_equal(
           expected: ab_test.dimension.to_s,
           actual: meta_tag.dimension.to_s,
-          error_message: <<-ERROR
+          error_message: <<-ERROR,
             The analytics meta tag for the '#{ab_test.name}' A/B test does not match the expected value.
           ERROR
         )

data/lib/govuk_ab_testing/acceptance_tests/active_support.rb

@@ -26,7 +26,7 @@ module GovukAbTesting
       end
 
       def vary_header
-        response.headers['Vary']
+        response.headers["Vary"]
       end
 
       def analytics_meta_tags_for_test(ab_test_name)
@@ -35,7 +35,7 @@ module GovukAbTesting
 
       def analytics_meta_tags
         if scope.response.body.empty?
-          raise "Cannot find response body. If this is an RSpec Rails test, " +
+          raise "Cannot find response body. If this is an RSpec Rails test, " \
             "check that 'render_views' is being called."
         end
 
@@ -43,8 +43,8 @@ module GovukAbTesting
 
         tags.map do |tag|
           MetaTag.new(
-            content: tag.attributes['content'].value,
-            dimension: tag.attributes['data-analytics-dimension'].value
+            content: tag.attributes["content"].value,
+            dimension: tag.attributes["data-analytics-dimension"].value,
           )
         end
       end

data/lib/govuk_ab_testing/acceptance_tests/capybara.rb

@@ -7,6 +7,7 @@ module GovukAbTesting
         unless scope.respond_to?(:page)
           raise "Page is not defined, are you using capybara?"
         end
+
         @capybara_page = scope.page
         @request_headers = {}
       end
@@ -23,7 +24,7 @@ module GovukAbTesting
       end
 
       def vary_header(*)
-        capybara_page.response_headers['Vary']
+        capybara_page.response_headers["Vary"]
       end
 
       def analytics_meta_tags_for_test(ab_test_name)
@@ -35,8 +36,8 @@ module GovukAbTesting
 
         tags.map do |tag|
           MetaTag.new(
-            content: tag['content'],
-            dimension: tag['data-analytics-dimension']
+            content: tag["content"],
+            dimension: tag["data-analytics-dimension"],
           )
         end
       end

data/lib/govuk_ab_testing/configuration.rb

@@ -1,7 +1,7 @@
 module GovukAbTesting
   class Configuration
-    VALID_FRAMEWORKS = %i(capybara active_support).freeze
-    attr_accessor :config, :acceptance_test_framework
+    VALID_FRAMEWORKS = %i[capybara active_support].freeze
+    attr_accessor :config
 
     def initialize
       @config = {}
@@ -24,9 +24,9 @@ module GovukAbTesting
       @framework_class ||= begin
         case config[:acceptance_test_framework]
         when :capybara
-          then GovukAbTesting::AcceptanceTests::Capybara
+          GovukAbTesting::AcceptanceTests::Capybara
         when :active_support
-          then GovukAbTesting::AcceptanceTests::ActiveSupport
+          GovukAbTesting::AcceptanceTests::ActiveSupport
         else
           raise "Invalid framework #{acceptance_test_framework}"
         end

data/lib/govuk_ab_testing/requested_variant.rb

@@ -56,17 +56,17 @@ module GovukAbTesting
     #
     # @param [ApplicationController::Response] the `response` in the controller
     def configure_response(response)
-      response.headers['Vary'] = [response.headers['Vary'], ab_test.response_header].compact.join(', ')
+      response.headers["Vary"] = [response.headers["Vary"], ab_test.response_header].compact.join(", ")
     end
 
     # HTML meta tag used to track the results of your experiment
     #
     # @return [String]
     def analytics_meta_tag
-      '<meta name="govuk:ab-test" ' +
-        'content="' + ab_test.meta_tag_name + ':' + variant_name + '" ' +
-        'data-analytics-dimension="' + @dimension.to_s + '" ' +
-        'data-allowed-variants="' + ab_test.allowed_variants.join(',') + '">'
+      '<meta name="govuk:ab-test" ' \
+        'content="' + ab_test.meta_tag_name + ":" + variant_name + '" ' \
+        'data-analytics-dimension="' + @dimension.to_s + '" ' \
+        'data-allowed-variants="' + ab_test.allowed_variants.join(",") + '">'
     end
   end
 end

data/lib/govuk_ab_testing/rspec_assertions.rb

@@ -10,6 +10,7 @@ module GovukAbTesting
 
     def assert_does_not_contain_substring(string:, substring:, error_message:)
       return if string.nil?
+
       expect(string).not_to include(substring), error_message
     end
 

data/lib/govuk_ab_testing/version.rb

@@ -1,3 +1,3 @@
 module GovukAbTesting
-  VERSION = "2.4.1".freeze
+  VERSION = "2.4.2".freeze
 end

metadata

@@ -1,85 +1,71 @@
 --- !ruby/object:Gem::Specification
 name: govuk_ab_testing
 version: !ruby/object:Gem::Version
-  version: 2.4.1
+  version: 2.4.2
 platform: ruby
 authors:
 - GOV.UK Dev
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2017-10-27 00:00:00.000000000 Z
+date: 2020-08-04 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '10.0'
+        version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '10.0'
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '3.0'
+        version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '3.0'
+        version: '0'
 - !ruby/object:Gem::Dependency
-  name: govuk-lint
+  name: rubocop-govuk
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: 1.2.1
+        version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: 1.2.1
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: yard
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '0.8'
+        version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '0.8'
-- !ruby/object:Gem::Dependency
-  name: gem_publisher
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: 1.5.0
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: 1.5.0
+        version: '0'
 description: Gem to help with A/B testing on the GOV.UK platform
 email:
 - govuk-dev@digital.cabinet-office.gov.uk
@@ -132,8 +118,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project: 
-rubygems_version: 2.6.13
+rubygems_version: 3.0.3
 signing_key: 
 specification_version: 4
 summary: Gem to help with A/B testing on the GOV.UK platform