bbc-a11y 0.0.6 → 0.0.7

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 02a747cee79f3519c0fc2124d6069462c8d3a567
-  data.tar.gz: 2206a476f841791cb74013b54f9403c3a3da39b9
+  metadata.gz: 7c500e30582170fa192229eecaf43deaa0433188
+  data.tar.gz: b241d785a67dd287ee88237bcd7e8dd51693f86f
 SHA512:
-  metadata.gz: c4945eae8117e5e223ac27d834d23196646f7e31b730d958fd5345d8d5928b16816ae828563304f9b9c7b6dbd7dd7aaced3fa3e1726104cc2026592f35684f43
-  data.tar.gz: 5f45f2a0bcb880de8f87edbeee24fc99b60899ab092d26495457e20ff2a77b7a8fbfcdbe615ee993270b46a139e6a760adfa69cd994529be9ed375ed9a728744
+  metadata.gz: 2f408fbb3a4eee36ed69a9b63876738355c78504df3165da084e708597c4af3cb975df980a9dd7d8a8cb00a2dafeb8cd27aa92c614b4b04b4ac96526bb6087f6
+  data.tar.gz: c8aaec1516aa562b8dd35509ed92cc499e720fe72ab49c6641b7add0e35ea4e19f1dc22b21f0dd437fe6f095434ef385670934fd9a1bba426978398eee1f88e3

data/features/support/skipper.rb

@@ -1,5 +1,5 @@
 Before do |test_case|
-  if settings.scenarios_to_skip.any? { |name| test_case.name.match name }
+  if settings.skip_test_case?(test_case)
     skip_this_scenario "Configured to be skipped"
   end
 end

data/lib/bbc/a11y/cli.rb

@@ -15,6 +15,7 @@ module BBC
       end
 
       def call
+        trap_interrupt
         CucumberRunner.new(settings, cucumber_args).call
       rescue MissingArgument => error
         stderr.puts "You missed an argument: #{error.message}"
@@ -33,6 +34,14 @@ module BBC
         args[args.find_index('--')+1..-1]
       end
 
+      def trap_interrupt
+        trap('INT') do
+          exit!(1) if Cucumber.wants_to_quit
+          Cucumber.wants_to_quit = true
+          STDERR.puts "\nExiting... Interrupt again to exit immediately."
+        end
+      end
+
       attr_reader :stdin, :stderr, :stdout, :args
       private :stdin, :stderr, :stdout, :args
 

data/lib/bbc/a11y/configuration.rb

@@ -21,30 +21,44 @@ module BBC
           :after_all_hooks,
           :pages
 
-        def initialize
-          @before_all_hooks = []
-          @after_all_hooks = []
-          @pages = []
+        def initialize(before_all_hooks = [], after_all_hooks = [], pages = [])
+          @before_all_hooks = before_all_hooks
+          @after_all_hooks = after_all_hooks
+          @pages = pages
           freeze
         end
+
+        def with_pages(new_pages)
+          self.class.new(before_all_hooks, after_all_hooks, new_pages)
+        end
       end
 
       class PageSettings
         attr_reader :url, :scenarios_to_skip, :world_extensions
 
-        def initialize(url)
+        def initialize(url, scenarios_to_skip = [], world_extensions = [])
           @url = url
-          @scenarios_to_skip = []
-          @world_extensions = []
+          @scenarios_to_skip = scenarios_to_skip
+          @world_extensions = world_extensions
           freeze
         end
+
+        def skip_test_case?(test_case)
+          @scenarios_to_skip.any? { |pattern| pattern.match test_case.name }
+        end
+
+        def merge(other)
+          self.class.new(url, scenarios_to_skip + other.scenarios_to_skip, world_extensions + other.world_extensions)
+        end
       end
 
       class DSL
         attr_reader :settings
         def initialize(block)
           @settings = Settings.new
+          @general_page_settings = []
           instance_eval &block
+          @settings = settings.with_pages(apply_general_settings(settings.pages))
         end
 
         def before_all(&block)
@@ -58,6 +72,21 @@ module BBC
         def page(url, &block)
           settings.pages << PageDSL.new(url, block).settings
         end
+
+        def for_pages_matching(url, &block)
+          @general_page_settings << PageDSL.new(url, block).settings
+        end
+
+        private
+
+        def apply_general_settings(all_page_settings)
+          all_page_settings.map { |page_settings|
+            matching_general_settings = @general_page_settings.select { |general_page_settings| general_page_settings.url.match page_settings.url }
+            matching_general_settings.reduce(page_settings) { |page_settings, general_page_settings|
+              page_settings.merge(general_page_settings)
+            }
+          }
+        end
       end
 
       class PageDSL

data/lib/bbc/a11y/version

@@ -1 +1 @@
-0.0.6
+0.0.7

data/spec/bbc/a11y/configuration_spec.rb

@@ -0,0 +1,62 @@
+require 'bbc/a11y/configuration'
+
+module BBC::A11y
+  describe Configuration do
+
+    before do
+      # reset configuration which is held in a class variable
+      BBC::A11y.instance_variable_set :@settings, nil
+    end
+
+    it "allows you to specify multiple pages" do
+      BBC::A11y.configure do
+        page "one.html"
+        page "two.html"
+      end
+
+      expect(BBC::A11y.configuration.pages.length).to eq 2
+      expect(BBC::A11y.configuration.pages[0].url).to eq "one.html"
+      expect(BBC::A11y.configuration.pages[1].url).to eq "two.html"
+    end
+
+    it "allows you to specify scenarios to be skipped for a given page" do
+      BBC::A11y.configure do
+        page "three.html" do
+          skip_scenario /^foo/
+        end
+      end
+
+      page_settings = BBC::A11y.configuration.pages[0]
+      test_case = double(name: "foo_page.html")
+      expect(page_settings.skip_test_case?(test_case)).to be_truthy
+    end
+
+    it "allows you to specify settings for all pages matching a given URL pattern" do
+      BBC::A11y.configure do
+        page "three.html" do
+          skip_scenario /^foo/
+        end
+        page "four.html"
+        page "five.html"
+
+        for_pages_matching /^f/ do
+          skip_scenario /^bar/
+        end
+
+        for_pages_matching /^five/ do
+          skip_scenario /^baz/
+        end
+      end
+
+      bar = double(name: "bar_page.html")
+      baz = double(name: "baz_page.html")
+      four_page_settings = BBC::A11y.configuration.pages[1]
+      expect(four_page_settings.skip_test_case?(bar)).to be_truthy
+      five_page_settings = BBC::A11y.configuration.pages[2]
+      expect(five_page_settings.skip_test_case?(bar)).to be_truthy
+      expect(five_page_settings.skip_test_case?(baz)).to be_truthy
+    end
+
+  end
+end
+

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: bbc-a11y
 version: !ruby/object:Gem::Version
-  version: 0.0.6
+  version: 0.0.7
 platform: ruby
 authors:
 - Matt Wynne
@@ -9,146 +9,146 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-02-12 00:00:00.000000000 Z
+date: 2015-03-10 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: cucumber
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
         version: 2.0.0.rc
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
         version: 2.0.0.rc
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
         version: '3.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
         version: '3.0'
 - !ruby/object:Gem::Dependency
   name: capybara
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: poltergeist
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: w3c_validators
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: cld
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: colorize
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: aruba
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: pry
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
 description: A tool for testing the compliance of web URLs against the BBC's accessibilty
@@ -159,7 +159,7 @@ executables:
 extensions: []
 extra_rdoc_files: []
 files:
-- ".rspec"
+- .rspec
 - CONTRIBUTING.md
 - Gemfile
 - LICENSE
@@ -217,6 +217,7 @@ files:
 - lib/bbc/a11y/cucumber_support/per_page_checks.rb
 - lib/bbc/a11y/cucumber_support/w3c.rb
 - lib/bbc/a11y/version
+- spec/bbc/a11y/configuration_spec.rb
 - spec/bbc/a11y/cucumber_support/heading_hierarchy_spec.rb
 - spec/bbc/a11y/cucumber_support/page_spec.rb
 homepage: https://cucumber.pro
@@ -225,25 +226,25 @@ licenses:
 metadata: {}
 post_install_message: 
 rdoc_options:
-- "--charset=UTF-8"
+- --charset=UTF-8
 require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ">="
+  - - '>='
     - !ruby/object:Gem::Version
       version: 1.9.3
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ">="
+  - - '>='
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.4.5
+rubygems_version: 2.0.14
 signing_key: 
 specification_version: 4
-summary: bbc-a11y-0.0.6
+summary: bbc-a11y-0.0.7
 test_files:
 - features/01_core-purpose.md
 - features/02_validation.feature
@@ -274,5 +275,7 @@ test_files:
 - features/support/skipper.rb
 - features/support/world.rb
 - features/support/world_extender.rb
+- spec/bbc/a11y/configuration_spec.rb
 - spec/bbc/a11y/cucumber_support/heading_hierarchy_spec.rb
 - spec/bbc/a11y/cucumber_support/page_spec.rb
+has_rdoc: