Update rspec

spec/news_sniffer_helper.rb

@@ -0,0 +1,40 @@
+def a_news_article(options = { })
+  @guid_count = @guid_count.to_i + 1
+  NewsArticle.create! @valid_attributes.merge(:guid => @guid_count).merge(options)
+end
+
+def some_news_page_html
+  @a_news_page ||= File.read("spec/fixtures/web_pages/7984711-A.stm.html").force_encoding('iso-8859-1')
+end
+
+def some_news_page_html_with_a_change
+  @a_news_page_with_a_change ||= File.read("spec/fixtures/web_pages/7984711-B.stm.html").force_encoding('iso-8859-1')
+end
+
+def some_news_page_html_with_no_title
+  @some_news_page_html_with_no_title ||= File.read("spec/fixtures/web_pages/7984711-invalid.html").force_encoding('iso-8859-1')
+end
+
+def a_news_article_with_one_version
+  na = a_news_article
+  p = WebPageParser::BbcNewsPageParserV5.new(:page => some_news_page_html)
+  na.update_from_page(p)
+  na.reload
+end
+
+def a_news_article_with_two_versions
+  na = a_news_article
+  p1 = WebPageParser::BbcNewsPageParserV5.new(:page => some_news_page_html)
+  p2 = WebPageParser::BbcNewsPageParserV5.new(:page => some_news_page_html_with_a_change)
+  na.update_from_page(p1)
+  na.update_from_page(p2)
+  na.reload
+end
+
+def some_rss_feed_xml
+  @some_rss_feed_xml ||= File.read("spec/fixtures/rss_feeds/bbc_uk_politics.xml")
+end
+
+def some_nyt_rss_feed_xml
+  @some_nyt_rss_feed_xml ||= File.read("spec/fixtures/rss_feeds/nyt_global_home.xml")
+end

spec/rails_helper.rb

@@ -0,0 +1,51 @@
+# This file is copied to spec/ when you run 'rails generate rspec:install'
+ENV["RAILS_ENV"] ||= 'test'
+require 'spec_helper'
+require File.expand_path("../../config/environment", __FILE__)
+require 'rspec/rails'
+# Add additional requires below this line. Rails is not loaded until this point!
+
+# Requires supporting ruby files with custom matchers and macros, etc, in
+# spec/support/ and its subdirectories. Files matching `spec/**/*_spec.rb` are
+# run as spec files by default. This means that files in spec/support that end
+# in _spec.rb will both be required and run as specs, causing the specs to be
+# run twice. It is recommended that you do not name files matching this glob to
+# end with _spec.rb. You can configure this pattern with the --pattern
+# option on the command line or in ~/.rspec, .rspec or `.rspec-local`.
+#
+# The following line is provided for convenience purposes. It has the downside
+# of increasing the boot-up time by auto-requiring all files in the support
+# directory. Alternatively, in the individual `*_spec.rb` files, manually
+# require only the support files necessary.
+#
+# Dir[Rails.root.join("spec/support/**/*.rb")].each { |f| require f }
+
+# Checks for pending migrations before tests are run.
+# If you are not using ActiveRecord, you can remove this line.
+ActiveRecord::Migration.maintain_test_schema!
+
+RSpec.configure do |config|
+  # Remove this line if you're not using ActiveRecord or ActiveRecord fixtures
+  config.fixture_path = "#{::Rails.root}/spec/fixtures"
+
+  # If you're not using ActiveRecord, or you'd prefer not to run each of your
+  # examples within a transaction, remove the following line or assign false
+  # instead of true.
+  config.use_transactional_fixtures = true
+
+  # RSpec Rails can automatically mix in different behaviours to your tests
+  # based on their file location, for example enabling you to call `get` and
+  # `post` in specs under `spec/controllers`.
+  #
+  # You can disable this behaviour by removing the line below, and instead
+  # explicitly tag your specs with their type, e.g.:
+  #
+  #     RSpec.describe UsersController, :type => :controller do
+  #       # ...
+  #     end
+  #
+  # The different available types are documented in the features, such as in
+  # https://relishapp.com/rspec/rspec-rails/docs
+  config.infer_spec_type_from_file_location!
+
+end

spec/spec_helper.rb

@@ -1,72 +1,92 @@
-# This file is copied to spec/ when you run 'rails generate rspec:install'
-ENV["RAILS_ENV"] ||= 'test'
-require File.expand_path("../../config/environment", __FILE__)
-require 'rspec/rails'
-
-# Requires supporting ruby files with custom matchers and macros, etc,
-# in spec/support/ and its subdirectories.
-Dir[Rails.root.join("spec/support/**/*.rb")].each {|f| require f}
+# This file was generated by the `rails generate rspec:install` command. Conventionally, all
+# specs live under a `spec` directory, which RSpec adds to the `$LOAD_PATH`.
+# The generated `.rspec` file contains `--require spec_helper` which will cause this
+# file to always be loaded, without a need to explicitly require it in any files.
+#
+# Given that it is always loaded, you are encouraged to keep this file as
+# light-weight as possible. Requiring heavyweight dependencies from this file
+# will add to the boot time of your test suite on EVERY test run, even for an
+# individual file that may not need all of that loaded. Instead, consider making
+# a separate helper file that requires the additional dependencies and performs
+# the additional setup, and require it from the spec files that actually need it.
+#
+# The `.rspec` file also contains a few flags that are not defaults but that
+# users commonly want.
 
+require 'news_sniffer_helper'
+#
+# See http://rubydoc.info/gems/rspec-core/RSpec/Core/Configuration
 RSpec.configure do |config|
-  # == Mock Framework
-  #
-  # If you prefer to use mocha, flexmock or RR, uncomment the appropriate line:
-  #
-  # config.mock_with :mocha
-  # config.mock_with :flexmock
-  # config.mock_with :rr
-  config.mock_with :rspec
-
-  # Remove this line if you're not using ActiveRecord or ActiveRecord fixtures
-  config.fixture_path = "#{::Rails.root}/spec/fixtures"
+  # rspec-expectations config goes here. You can use an alternate
+  # assertion/expectation library such as wrong or the stdlib/minitest
+  # assertions if you prefer.
+  config.expect_with :rspec do |expectations|
+    # This option will default to `true` in RSpec 4. It makes the `description`
+    # and `failure_message` of custom matchers include text for helper methods
+    # defined using `chain`, e.g.:
+    # be_bigger_than(2).and_smaller_than(4).description
+    #   # => "be bigger than 2 and smaller than 4"
+    # ...rather than:
+    #   # => "be bigger than 2"
+    expectations.include_chain_clauses_in_custom_matcher_descriptions = true
+  end
 
-  # If you're not using ActiveRecord, or you'd prefer not to run each of your
-  # examples within a transaction, remove the following line or assign false
-  # instead of true.
-  config.use_transactional_fixtures = true
+  # rspec-mocks config goes here. You can use an alternate test double
+  # library (such as bogus or mocha) by changing the `mock_with` option here.
+  config.mock_with :rspec do |mocks|
+    # Prevents you from mocking or stubbing a method that does not exist on
+    # a real object. This is generally recommended, and will default to
+    # `true` in RSpec 4.
+    mocks.verify_partial_doubles = true
+  end
 
   config.expect_with :rspec do |c|
-    c.syntax = :should
+    c.syntax = [:should, :expect]
   end
-end
-
-def a_news_article(options = { })
-  @guid_count = @guid_count.to_i + 1
-  NewsArticle.create! @valid_attributes.merge(:guid => @guid_count).merge(options)
-end
 
-def some_news_page_html
-  @a_news_page ||= File.read("spec/fixtures/web_pages/7984711-A.stm.html").force_encoding('iso-8859-1')
-end
 
-def some_news_page_html_with_a_change
-  @a_news_page_with_a_change ||= File.read("spec/fixtures/web_pages/7984711-B.stm.html").force_encoding('iso-8859-1')
-end
+# The settings below are suggested to provide a good initial experience
+# with RSpec, but feel free to customize to your heart's content.
+=begin
+  # These two settings work together to allow you to limit a spec run
+  # to individual examples or groups you care about by tagging them with
+  # `:focus` metadata. When nothing is tagged with `:focus`, all examples
+  # get run.
+  config.filter_run :focus
+  config.run_all_when_everything_filtered = true
 
-def some_news_page_html_with_no_title
-  @some_news_page_html_with_no_title ||= File.read("spec/fixtures/web_pages/7984711-invalid.html").force_encoding('iso-8859-1')
-end
+  # Limits the available syntax to the non-monkey patched syntax that is recommended.
+  # For more details, see:
+  #   - http://myronmars.to/n/dev-blog/2012/06/rspecs-new-expectation-syntax
+  #   - http://teaisaweso.me/blog/2013/05/27/rspecs-new-message-expectation-syntax/
+  #   - http://myronmars.to/n/dev-blog/2014/05/notable-changes-in-rspec-3#new__config_option_to_disable_rspeccore_monkey_patching
+  config.disable_monkey_patching!
 
-def a_news_article_with_one_version
-  na = a_news_article
-  p = WebPageParser::BbcNewsPageParserV5.new(:page => some_news_page_html)
-  na.update_from_page(p)
-  na.reload
-end
+  # Many RSpec users commonly either run the entire suite or an individual
+  # file, and it's useful to allow more verbose output when running an
+  # individual spec file.
+  if config.files_to_run.one?
+    # Use the documentation formatter for detailed output,
+    # unless a formatter has already been configured
+    # (e.g. via a command-line flag).
+    config.default_formatter = 'doc'
+  end
 
-def a_news_article_with_two_versions
-  na = a_news_article
-  p1 = WebPageParser::BbcNewsPageParserV5.new(:page => some_news_page_html)
-  p2 = WebPageParser::BbcNewsPageParserV5.new(:page => some_news_page_html_with_a_change)
-  na.update_from_page(p1)
-  na.update_from_page(p2)
-  na.reload
-end
+  # Print the 10 slowest examples and example groups at the
+  # end of the spec run, to help surface which specs are running
+  # particularly slow.
+  config.profile_examples = 10
 
-def some_rss_feed_xml
-  @some_rss_feed_xml ||= File.read("spec/fixtures/rss_feeds/bbc_uk_politics.xml")
-end
+  # Run specs in random order to surface order dependencies. If you find an
+  # order dependency and want to debug it, you can fix the order by providing
+  # the seed, which is printed after each run.
+  #     --seed 1234
+  config.order = :random
 
-def some_nyt_rss_feed_xml
-  @some_nyt_rss_feed_xml ||= File.read("spec/fixtures/rss_feeds/nyt_global_home.xml")
+  # Seed global randomization in this process using the `--seed` CLI option.
+  # Setting this allows you to use `--seed` to deterministically reproduce
+  # test failures related to randomization by passing the same `--seed` value
+  # as the one that triggered the failure.
+  Kernel.srand config.seed
+=end
 end