foodcritic 10.2.2 → 10.3.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: dcbbb15acbc25d0fdec9a129d629d5a45c08ef3a
-  data.tar.gz: 7982dfc208b2c1a15466aead18c67964dbd87335
+  metadata.gz: 51965965410c5bca11ae0c137067c1a431fec90d
+  data.tar.gz: 61d4b6217f52adad76a864d344f32e723de36c79
 SHA512:
-  metadata.gz: a4a3b4dbbfd73ba79d6a41d4b518a2b911836ded03b1d686266a0529ec0e952c0846622cba28bb513be8e4fc8952f014744c3752ddacb124f0accc50754dd772
-  data.tar.gz: 5804dbecb771cdff66df4f4be7c67a082b9ac6029c0706aa6b02217d91a281c8e10c85de8a1680ba124f75a4a21639b6a8eb6e581a9d46d093610cc0644cfb2f
+  metadata.gz: b633d70600b84b66af81dc39647cd129bc951a09c381b861a6aa11317376479d08e388c3bb5439993949629afb1b8bc4912f5ff4d00d91bd9004bf27d3f15342
+  data.tar.gz: c7d934d01cc45d6e528be29d5125c1475803d31e9511c0e54c5b27cc520d6642c3320b611b2cdb8a731ad1b30643d9fdb7648b041bcf4852552f8e9ce497d148

data/CHANGELOG.md

@@ -1,13 +1,34 @@
 # Foodcritic Changelog:
 
-## [10.2.2](https://github.com/acrmp/foodcritic/tree/10.2.2) (2017-03-31)
-[Full Changelog](https://github.com/acrmp/foodcritic/compare/v10.2.1...10.2.2)
+## [10.3.0](https://github.com/acrmp/foodcritic/tree/v10.3.0) (2017-04-10)
+
+[Full Changelog](https://github.com/acrmp/foodcritic/compare/v10.2.2...v10.3.0)
+
+**Implemented enhancements:**
+
+- Added `FC069` to ensure standardized licenses are defined in metadata
+- Added `FC070` to detect invalid platform supports in metadata
+- Added `FC071` to ensure a LICENSE file is included with the cookbook
+- Added `FC072` to detect attributes defined in metadata
+- Added `FC073` to detect root alias collisions with non-root alias files
+- Added `FC074` to detect setting the default_action in a LWRP without using the default_action DSL
+- Added `FC075` to detect node.save usage
+- Updated `FC008` to fail if the ChefDK generated boilerplate is included
+- Updated `FC024` to not recommend adding amazon as an equivalent platform to Redhat as Amazon is its own platform family in Chef 13
+- Updated `FC045` to no longer fail if metadata.rb cannot be found
+- Added support for the Chef 13 root alias cookbook structure changes defined in <https://github.com/chef/chef-rfc/blob/master/rfc033-root-aliases.md>
+- Testing has been completed reworked to simplify testing and allow for far more robust functional tests. Minitest unit tests have been converted to rspec and a new functional testing framework has been added utilizing rspec. Tests for a large number of the existing rules have been converted to this new framework. The new testing framework allows for simple all-in-one tests that are easier to read and much simpler to write. Additionally the regression tests have been reworked, and are now enabled in Travis CI, which will require regeneration of the expected output if new tests are added using `rake regen_regression`. See the readme for additional details on running tests.
+
+## [10.2.2](https://github.com/acrmp/foodcritic/tree/v10.2.2) (2017-03-31)
+
+[Full Changelog](https://github.com/acrmp/foodcritic/compare/v10.2.1...v10.2.2)
 
 **Implemented enhancements:**
 
 - Align rake setup better with CLI options to resolve bugs with tags in Rake [\#533](https://github.com/acrmp/foodcritic/pull/533) ([tas50](https://github.com/tas50))
 
 ## [v10.2.1](https://github.com/acrmp/foodcritic/tree/v10.2.1) (2017-03-31)
+
 [Full Changelog](https://github.com/acrmp/foodcritic/compare/v10.2.0...v10.2.1)
 
 **Implemented enhancements:**
@@ -15,6 +36,7 @@
 - Add supermarket tag to FC067 and FC068 [\#532](https://github.com/acrmp/foodcritic/pull/532) ([tas50](https://github.com/tas50))
 
 ## [v10.2.0](https://github.com/acrmp/foodcritic/tree/v10.2.0) (2017-03-30)
+
 [Full Changelog](https://github.com/acrmp/foodcritic/compare/v10.1.1...v10.2.0)
 
 **Implemented enhancements:**

data/Gemfile

@@ -1,6 +1,6 @@
 source "https://rubygems.org"
 
-gem "foodcritic", :path => "."
+gemspec
 
 group :test do
   gem "aruba", "~> 0.5"
@@ -13,6 +13,7 @@ end
 
 group :development do
   gem "ronn", "~> 0.7"
+  gem "pry"
 end
 
 group :changelog do

data/README.md

@@ -33,7 +33,7 @@ Foodcritic includes rspec tests of the application itself and cucumber tests for
 Running rspec tests:
 
 ```
-$ bundle exec rake test
+$ bundle exec rake spec
 ```
 
 Running cucumber tests:
@@ -42,6 +42,12 @@ Running cucumber tests:
 $ bundle exec rake features
 ```
 
+Running regression tests:
+
+```
+$ bundle exec rake 'spec[regression]'
+```
+
 ## License
 
 MIT - see the accompanying [LICENSE](https://github.com/acrmp/foodcritic/blob/master/LICENSE) file for details.

data/Rakefile

@@ -1,49 +1,42 @@
-require "foodcritic/version"
-require "bundler"
-require "rake/testtask"
+require "bundler/setup"
+require "mixlib/shellout"
 
-task :default => [:man, :install, :test, :features, :rubocop]
+require "bundler/gem_tasks"
 
-Bundler.setup
-Bundler::GemHelper.install_tasks
-
-Rake::TestTask.new do |t|
-  t.pattern = "spec/foodcritic/*_spec.rb"
-end
-
-Rake::TestTask.new do |t|
-  t.name = "regressions"
-  t.pattern = "spec/regression/*_spec.rb"
+require "rspec/core/rake_task"
+RSpec::Core::RakeTask.new(:spec, :tag) do |t, args|
+  t.rspec_opts = [].tap do |a|
+    a << "--color"
+    a << "--format #{ENV['CI'] ? 'documentation' : 'Fuubar'}"
+    a << "--backtrace" if ENV["DEBUG"]
+    a << "--seed #{ENV['SEED']}" if ENV["SEED"]
+    a << "--tag ~regression" unless ENV["CI"] || args[:tag] == "regression"
+    a << "--tag #{args[:tag]}" if args[:tag]
+  end.join(" ")
 end
 
-begin
-  require "cucumber"
-  require "cucumber/rake/task"
-  Cucumber::Rake::Task.new(:features) do |t|
-    t.cucumber_opts = ["-f", "progress", "--strict"]
-    unless ENV.has_key?("FC_FORK_PROCESS") && ENV["FC_FORK_PROCESS"] == true.to_s
-      t.cucumber_opts += ["-t", "~@build"]
-      t.cucumber_opts += ["-t", "~@context"]
-    end
-    t.cucumber_opts += ["features"]
+require "cucumber"
+require "cucumber/rake/task"
+Cucumber::Rake::Task.new(:features) do |t|
+  t.cucumber_opts = %w{--strict}
+  t.cucumber_opts += %w{-f progress} unless ENV["CI"]
+  unless ENV.has_key?("FC_FORK_PROCESS") && ENV["FC_FORK_PROCESS"] == "true"
+    t.cucumber_opts += ["-t", "~@build"]
+    t.cucumber_opts += ["-t", "~@context"]
   end
-rescue LoadError
-  puts "cucumber is not available. gem install cucumber to get 'rake features' to work"
+  t.cucumber_opts += ["features"]
 end
 
-begin
-  require "chefstyle"
-  require "rubocop/rake_task"
-  desc "Run Chefstyle (rubocop)"
-  RuboCop::RakeTask.new do |task|
-    task.options << "--display-cop-names"
-  end
-rescue LoadError
-  puts "chefstyle gem is not available. gem install chefstyle to get rake rubocop to work"
+require "chefstyle"
+require "rubocop/rake_task"
+desc "Run Chefstyle (rubocop)"
+RuboCop::RakeTask.new do |task|
+  task.options << "--display-cop-names"
 end
 
 begin
   require "github_changelog_generator/task"
+  require_relative "../lib/foodcritic/version"
 
   GitHubChangelogGenerator::RakeTask.new :changelog do |config|
     config.header = "# Foodcritic Changelog:"
@@ -61,3 +54,30 @@ desc "Build the manpage"
 task(:man) do
   sh "ronn -w --roff man/*.ronn"
 end
+
+task :default => [:man, :test, :rubocop]
+
+desc "Run all tests"
+task :test => [:spec, :features]
+
+desc "Regenerate regression test data"
+task :regen_regression do
+  in_path = File.expand_path("../spec/regression/cookbooks.txt", __FILE__)
+  cookbooks = IO.readlines(in_path)
+  cookbooks.each_with_index do |line, i|
+    name, ref = line.strip.split(":")
+    puts "Regenerating output for #{name} (#{i + 1}/#{cookbooks.size})"
+    Dir.mktmpdir do |temp|
+      clone_cmd = Mixlib::ShellOut.new("git", "clone", "https://github.com/chef-cookbooks/#{name}.git", ".", cwd: temp)
+      clone_cmd.run_command
+      clone_cmd.error!
+      checkout_cmd = Mixlib::ShellOut.new("git", "checkout", ref, cwd: temp)
+      checkout_cmd.run_command
+      checkout_cmd.error!
+      fc_cmd = Mixlib::ShellOut.new(File.expand_path("../bin/foodcritic", __FILE__), "--no-progress", ".", cwd: temp)
+      fc_cmd.run_command
+      out_path = File.expand_path("../spec/regression/expected/#{name}.txt", __FILE__)
+      IO.write(out_path, fc_cmd.stdout)
+    end
+  end
+end

data/bin/foodcritic

@@ -1,9 +1,3 @@
 #!/usr/bin/env ruby
 require_relative "../lib/foodcritic"
-module FoodCritic
-  cmd_line = CommandLine.new(ARGV)
-  review, status = Linter.run(cmd_line)
-  printer = cmd_line.show_context? ? ContextOutput.new : SummaryOutput.new
-  printer.output(review)
-  exit status.to_i
-end
+exit FoodCritic::CommandLine.main

data/features/024_check_for_missing_platforms.feature

@@ -14,9 +14,8 @@ Feature: Check for missing platforms
       | type      | supports                    | flavours                                              | warning             |
       | case      |                             | chalk,cheese                                          | should not be shown |
       | case      |                             | debian,ubuntu                                         | should not be shown |
-      | case      |                             | amazon,centos,redhat,scientific,oracle                | should not be shown |
-      | case      |                             | centos,redhat,amazon,scientific,oracle                | should not be shown |
-      | case      |                             | centos,debian,fedora,redhat,amazon,scientific,oracle  | should not be shown |
+      | case      |                             | centos,redhat,scientific,oracle                       | should not be shown |
+      | case      |                             | centos,debian,fedora,redhat,scientific,oracle         | should not be shown |
       | case      |                             | redhat                                                | should not be shown |
       | case      |                             | centos,redhat                                         | should be shown     |
       | case      | centos,redhat               | centos,redhat                                         | should not be shown |
@@ -25,7 +24,7 @@ Feature: Check for missing platforms
       | case      | centos,debian,scientific    | centos,scientific                                     | should not be shown |
       | case      | centos,redhat,scientific    | redhat,scientific                                     | should be shown     |
       | case      | debian,redhat,centos,fedora | redhat,centos,fedora                                  | should not be shown |
-      | platform? |                             | centos,redhat,amazon,scientific,oracle                | should not be shown |
+      | platform? |                             | centos,redhat,scientific,oracle                       | should not be shown |
       | platform? |                             | redhat                                                | should not be shown |
       | platform? |                             | redhat,scientific                                     | should be shown     |
       | platform? | redhat,scientific           | redhat,scientific                                     | should not be shown |

data/features/continuous_integration_support.feature

@@ -26,10 +26,10 @@ Feature: Continuous Integration Support
     | FC002,FC005       | -f ~any                       | FC002,FC005       | successful   |
     | FC002,FC005       | -f any -f ~FC014              | FC002,FC005       | failed       |
     | FC002,FC005       | -f any,~FC014                 | FC002,FC005       | failed       |
-    | FC002             | -f ~FC002 -f ~metadata        | FC002             | successful   |
+    | FC002             | -f ~FC002 -f ~metadata        | FC002             | failed       |
     | FC002,FC005       | -f ~FC002                     | FC002,FC005       | failed       |
     | FC002,FC005       | -f any -f ~FC002              | FC002,FC005       | failed       |
     | FC002             | -f any,~FC002                 | FC002             | failed       |
-    | FC002             | -f any -f ~FC002 -f ~metadata | FC002             | successful   |
+    | FC002             | -f any -f ~FC002 -f ~metadata | FC002             | failed       |
     | FC002,FC005       | -f any,~FC002                 | FC002,FC005       | failed       |
     | FC002,FC005       | -f ~FC002 -f ~FC004           | FC002,FC005       | failed       |

data/features/step_definitions/cookbook_steps.rb

@@ -978,22 +978,6 @@ Given "a cookbook that contains a LWRP with multiple notifications" do
   })
 end
 
-Given /^a cookbook that contains a LWRP with (no|a) default action( defined via a constructor)?$/ do |has_default_action, no_dsl|
-  default_action = if has_default_action == "no"
-                     :no_default_action
-                   elsif no_dsl.nil?
-                     :dsl_default_action
-                   else
-                     :ruby_default_action
-  end
-  cookbook_with_lwrp({ :default_action => default_action,
-                       :notifies => :does_notify })
-end
-
-Given "a cookbook that contains a custom resource with no default action" do
-  cookbook_with_custom_resource
-end
-
 Given "a cookbook that contains no ruby blocks" do
   write_recipe %q{
     package "tar" do
@@ -1013,12 +997,6 @@ Given /^a cookbook that does not contain a definition and has (no|a) definitions
   }
 end
 
-Given "a cookbook that does not have a README at all" do
-  write_recipe %q{
-    log "Use the source luke"
-  }
-end
-
 Given "a cookbook that does not have defined metadata" do
   write_recipe %q{
     include_recipe "foo::default"
@@ -1043,33 +1021,6 @@ Given /^a cookbook that has ([^ ]+) problems$/ do |problems|
   )
 end
 
-Given "a cookbook that has a README in markdown format" do
-  write_recipe %q{
-    log "Hello"
-  }
-  write_file "cookbooks/example/README.md", %q{
-    Description
-    ===========
-
-    Hi. This is markdown.
-  }
-end
-
-Given "a cookbook that has a README in RDoc format" do
-  write_recipe %q{
-    log "Hello"
-  }
-  write_file "cookbooks/example/README.rdoc", %q{
-    = DESCRIPTION:
-
-    I used to be the preferred format but not any more (sniff).
-  }
-end
-
-Given /^a cookbook that has maintainer metadata set to (.*) and ([^ ]+)$/ do |name, email|
-  cookbook_with_maintainer(nil_if_unspecified(name), nil_if_unspecified(email))
-end
-
 Given "a cookbook that has the default boilerplate metadata generated by knife" do
   cookbook_with_maintainer("YOUR_COMPANY_NAME", "YOUR_EMAIL")
 end
@@ -1335,51 +1286,6 @@ Given "a cookbook with five recipes" do
 
 end
 
-Given /^a cookbook with metadata that declares a recipe with (.*)$/ do |declaration|
-  write_metadata declaration
-  write_recipe ""
-end
-
-Given /^a cookbook with metadata that (specifies|does not specify) the cookbook name$/ do |specifies|
-  write_metadata %Q{
-    #{"name 'example'" if specifies == 'specifies'}
-  }
-end
-
-Given /^a cookbook with metadata that (includes|does not include) a maintainer keyword$/ do |includes|
-  write_metadata %Q{
-    #{"maintainer 'A Maintainer'" if includes == 'includes'}
-  }
-end
-
-Given /^a cookbook with metadata that (includes|does not include) a maintainer email$/ do |includes|
-  write_metadata %Q{
-   #{"maintainer_email 'maintainer@example.com'" if includes == 'includes'}
-  }
-end
-
-Given "a cookbook with metadata that includes a maintainer expression" do
-  write_metadata "maintainer an(expression)"
-end
-
-Given "a cookbook with metadata that includes a maintainer email expression" do
-  write_metadata "maintainer_email an(expression)"
-end
-
-Given /^a cookbook with metadata that (includes|does not include) a recommends keyword$/ do |includes|
-  write_metadata %Q{
-    depends "bar"
-    #{"recommends 'foo'" if includes == 'includes'}
-  }
-end
-
-Given /^a cookbook with metadata that (includes|does not include) a suggests keyword$/ do |includes|
-  write_metadata %Q{
-    depends "bar"
-    #{"suggests 'foo'" if includes == 'includes'}
-  }
-end
-
 Given /^a directory that contains a role file ([^ ]+) in (json|ruby) that defines role name (.*)$/ do |file_name, format, role_name|
   role(:role_name => %Q{"#{role_name}"}, :file_name => file_name, :format => format.to_sym)
 end
@@ -1776,18 +1682,6 @@ Given "a recipe that tries to mask a systemd service" do
   }
 end
 
-Given /^a recipe that uses require_recipe$/ do
-  write_recipe %Q{
-    require_recipe "foo::default"
-  }
-end
-
-Given /^a recipe that uses include_recipe$/ do
-  write_recipe %Q{
-    include_recipe "foo::default"
-  }
-end
-
 Given /^a ruby environment file that defines an environment with name (.*)$/ do |env_name|
   environment(:environment_name => %Q{"#{env_name}"}, :file_name => "production.rb")
 end
@@ -1864,22 +1758,24 @@ When /^I check the cookbook specifying ([^ ]+) as the Chef version$/ do |version
   cd "." do
     options = ["-I", "rules/test.rb"] + options if Dir.exist?("rules")
   end
+  options += %w{--no-progress}
   run_lint(options)
 end
 
 When /^I check the cookbook( tree)?(?: specifying tags(.*))?(, specifying that context should be shown)?$/ do |whole_tree, tags, context|
   options = tags.nil? ? [] : tags.split(" ")
   options += ["-C"] unless context.nil?
+  options += %w{--no-progress}
   run_lint(options + ["cookbooks/#{whole_tree.nil? ? 'example' : ''}"])
 end
 
 Given /^the cookbook directory has a \.foodcritic file specifying tags (.*)$/ do |tags|
   write_file "cookbooks/example/.foodcritic", tags
-  run_lint(["cookbooks/example"])
+  run_lint(["--no-progress", "cookbooks/example"])
 end
 
 When "I check both cookbooks specified as arguments" do
-  run_lint(["cookbooks/another_example", "cookbooks/example"])
+  run_lint(["--no-progress", "cookbooks/another_example", "cookbooks/example"])
 end
 
 When /^I check both cookbooks with the command-line (.*)$/ do |command_line|
@@ -1890,15 +1786,16 @@ When /^I check both cookbooks with the command-line (.*)$/ do |command_line|
       c
     end
   end
-  run_lint(cmds)
+  run_lint(%w{--no-progress} + cmds)
 end
 
 When "I check both roles directories" do
-  run_lint ["-R", "roles1", "-R", "roles2"]
+  run_lint ["--no-progress", "-R", "roles1", "-R", "roles2"]
 end
 
 When "I check the cookbooks, role and environment together" do
   run_lint([
+    "--no-progress",
     "-B", "cookbooks/another_example", "-B", "cookbooks/example",
     "-E", "environments",
     "-R", "roles"
@@ -1906,24 +1803,24 @@ When "I check the cookbooks, role and environment together" do
 end
 
 When "I check the cookbook without specifying a Chef version" do
-  run_lint(["-I", "rules/test.rb", "cookbooks/example"])
+  run_lint(["--no-progress", "-I", "rules/test.rb", "cookbooks/example"])
 end
 
 When "I check the environment directory" do
-  run_lint ["-E", "environments"]
+  run_lint ["--no-progress", "-E", "environments"]
 end
 
 When "I check the eu environment file only" do
-  run_lint ["-E", "environments/production_eu.rb"]
+  run_lint ["--no-progress", "-E", "environments/production_eu.rb"]
 end
 
 When /^I check the cookbook( without)? excluding the ([^ ]+) directory$/ do |no_exclude, dir|
   options = no_exclude.nil? ? ["-X", dir] : []
-  run_lint(options + ["cookbooks/example"])
+  run_lint(options + ["--no-progress", "cookbooks/example"])
 end
 
 When "I check the recipe" do
-  run_lint(["cookbooks/example/recipes/default.rb"])
+  run_lint(["--no-progress", "cookbooks/example/recipes/default.rb"])
 end
 
 When "I compare the man page options against the usage options" do
@@ -1931,20 +1828,20 @@ When "I compare the man page options against the usage options" do
 end
 
 When "I check the role directory" do
-  run_lint ["-R", "roles"]
+  run_lint ["--no-progress", "-R", "roles"]
 end
 
 When /^I check the role directory as a (default|cookbook|role) path$/ do |path_type|
   options = case path_type
-    when "default" then ["roles"]
-    when "cookbook" then ["-B", "roles"]
-    when "role" then ["-R", "roles"]
+    when "default" then ["--no-progress", "roles"]
+    when "cookbook" then ["--no-progress", "-B", "roles"]
+    when "role" then ["--no-progress", "-R", "roles"]
   end
   run_lint(options)
 end
 
 When "I check the webserver role only" do
-  run_lint ["-R", "roles/webserver.rb"]
+  run_lint ["--no-progress", "-R", "roles/webserver.rb"]
 end
 
 When "I list the available build tasks" do
@@ -1960,7 +1857,7 @@ When /^I run it on the command line including a custom rule (file|directory) con
         end
       end
   }
-  run_lint(["-I",
+  run_lint(["--no-progress", "-I",
             path_type == "file" ? "rules/custom_rules.rb" : "rules",
             "cookbooks/example"])
 end
@@ -1968,25 +1865,25 @@ end
 When /^I run it on the command line including a file which does not contain Ruby code$/ do
   write_file "rules/invalid_rules.rb", 'echo "not ruby"'
   capture_error do
-    run_lint(["-I", "rules/invalid_rules.rb", "cookbooks/example"])
+    run_lint(["--no-progress", "-I", "rules/invalid_rules.rb", "cookbooks/example"])
   end
 end
 
 When /^I run it on the command line including a missing custom rule file$/ do
   capture_error do
-    run_lint(["-I", "rules/missing_rules.rb", "cookbooks/example"])
+    run_lint(["--no-progress", "-I", "rules/missing_rules.rb", "cookbooks/example"])
   end
 end
 
 When "I run it on the command line specifying a cookbook that does not exist" do
-  run_lint(["no-such-cookbook"])
+  run_lint(["--no-progress", "no-such-cookbook"])
 end
 
 When /^I run it on the command line specifying a( role|n environment) directory that does not exist$/ do |type|
   if type.include?("role")
-    run_lint(["-R", "no-such-role-dir"])
+    run_lint(["--no-progress", "-R", "no-such-role-dir"])
   else
-    run_lint(["-E", "no-such-environment-dir"])
+    run_lint(["--no-progress", "-E", "no-such-environment-dir"])
   end
 end
 
@@ -2154,14 +2051,6 @@ Then /^the attribute consistency warning 019 should be (shown|not shown)$/ do |s
   expect_warning("FC019", :line => nil, :expect_warning => show_warning == "shown")
 end
 
-Then /^the boilerplate metadata warning 008 should warn on lines (.*)$/ do |lines_to_warn|
-  if lines_to_warn.strip == ""
-    expect_no_warning("FC008")
-  else
-    lines_to_warn.split(",").each { |line| expect_warning("FC008", :line => line, :file => "metadata.rb") }
-  end
-end
-
 Then /the build status should be (successful|failed)$/ do |build_outcome|
   build_outcome == "successful" ? assert_no_error_occurred : assert_error_occurred
 end
@@ -2225,24 +2114,6 @@ Then "the missing template warning 033 should not be displayed against the templ
   expect_warning("FC033", :line => 3, :expect_warning => false)
 end
 
-Then /^the no leading cookbook name warning 029 should be (not )?shown$/ do |should_not|
-  expect_warning("FC029", :line => 1, :expect_warning => should_not.nil?, :file => "metadata.rb")
-end
-
-Then "the node access warning 001 should be displayed for each match" do
-  expect_warning("FC001", :line => 1)
-  expect_warning("FC001", :line => 2)
-end
-
-Then "the node access warning 001 should be displayed against the variables" do
-  expect_warning("FC001", :line => 4)
-  expect_warning("FC001", :line => 5)
-end
-
-Then "the node access warning 001 should be displayed twice for the same line" do
-  expect_warning("FC001", :line => 1, :num_occurrences => 2)
-end
-
 Then "the node access warning 001 should warn on lines 2 and 10 in that order" do
   expected_warnings = [2, 10].map do |line|
     "FC001: Use strings in preference to symbols to access node attributes: cookbooks/example/recipes/default.rb:#{line}"
@@ -2250,14 +2121,6 @@ Then "the node access warning 001 should warn on lines 2 and 10 in that order" d
   expect_output(expected_warnings.join("\n"))
 end
 
-Then "the node access warning 001 should be displayed for the recipe" do
-  expect_warning("FC001")
-end
-
-Then "the node access warning 001 should not be displayed for the attributes" do
-  expect_warning("FC001", :file_type => :attributes, :line => 1, :expect_warning => false)
-end
-
 Then "the prefer chef_gem to manual install warning 025 should be shown" do
   expect_warning("FC025", :line => nil)
 end
@@ -2338,7 +2201,7 @@ When /^I check the cookbook specifying a search grammar that (does not exist|is
     when "is a valid treetop grammar"
       write_file("search.treetop", IO.read(FoodCritic::Chef::Search.new.chef_search_grammars.first))
   end
-  run_lint(["--search-grammar", "search.treetop", "cookbooks/example"])
+  run_lint(["--no-progress", "--search-grammar", "search.treetop", "cookbooks/example"])
 end
 
 Then /^the check should abort with an error$/ do
@@ -2452,127 +2315,3 @@ Given /^a cookbook that contains a library resource$/ do
   }
   write_library("lib", library_file)
 end
-
-Given "a cookbook with metadata that includes the version keyword and a valid version string" do
-  write_metadata %q{version '1.2.3'}
-end
-
-Given "a cookbook with metadata that includes the version keyword and a valid version string with double quotes" do
-  write_metadata %q{version '1.2.3'}
-end
-
-Given "a cookbook with metadata that includes the version keyword and a valid x.y version string" do
-  write_metadata %q{version '1.2'}
-end
-
-Given "a cookbook with metadata that does not include a version keyword" do
-  write_metadata %Q{
-    name 'test'
-  }
-end
-
-Given "a cookbook with metadata that includes the version keyword and an invalid version string" do
-  write_metadata %q{version '1.a.3'}
-end
-
-Given "a cookbook with metadata that includes the version keyword and an invalid single digit version string" do
-  write_metadata %q{version '1'}
-end
-
-Given "a cookbook with metadata that includes the version keyword and an invalid 4 digit version string" do
-  write_metadata %q{version '1.2.3.4'}
-end
-
-Given "a cookbook with a metadata version that uses string interpolation" do
-  write_metadata %q{
-    patch = 3
-    version "1.2.#{patch}"
-  }
-end
-
-Given "a cookbook with a metadata version that is not a string literal" do
-  write_metadata %q{
-    v = "1.2.3"
-    version v
-  }
-end
-
-Given "a cookbook with a metadata version that is a method call" do
-  write_metadata %q{
-    version magic_version_generator('and its args')
-  }
-end
-
-Given(/^a cookbook with metadata that (includes|does not include) a self dependency$/) do |includes|
-  write_metadata %Q{
-    name 'bar'
-    depends 'baz'
-    #{"depends 'bar'" if includes == 'includes'}
-  }
-end
-
-Then(/^the metadata with self dependency warning 063 should be (shown|not shown) against the metadata file$/) do |show_warning|
-  if show_warning == "shown"
-    expect_warning("FC063", :file => "metadata.rb", :line => 3, :expect_warning => true)
-  else
-    expect_warning("FC063", :file => "metadata.rb", :expect_warning => false)
-  end
-end
-
-Given(/^a cookbook with metadata that (includes|does not include) a issues_url keyword$/) do |includes|
-  write_metadata %Q{
-    #{"issues_url 'http://github.com/foo/bar_cookbook/issues'" if includes == 'includes'}
-  }
-end
-
-Given(/^a cookbook with metadata that includes a issues_url expression$/) do
-  write_metadata "issues_url an(expression)"
-end
-
-Then(/^the metadata missing issues_url warning 064 should be (shown|not shown) against the metadata file$/) do |show_warning|
-  expect_warning("FC064", :file => "metadata.rb", :expect_warning => show_warning == "shown")
-end
-
-Given(/^a cookbook with metadata that (includes|does not include) a source_url keyword$/) do |includes|
-  write_metadata %Q{
-    #{"source_url 'http://github.com/foo/bar_cookbook/'" if includes == 'includes'}
-  }
-end
-
-Then(/^the metadata missing source_url warning 065 should be (shown|not shown) against the metadata file$/) do |show_warning|
-  expect_warning("FC065", :file => "metadata.rb", :expect_warning => show_warning == "shown")
-end
-
-Given(/^a cookbook with metadata that includes a source_url expression$/) do
-  write_metadata "source_url an(expression)"
-end
-
-Given(/^a cookbook with metadata that (includes|does not include) a chef_version keyword$/) do |includes|
-  write_metadata %Q{
-    #{"chef_version '> 12.6'" if includes == 'includes'}
-  }
-end
-
-Then(/^the metadata missing chef_version warning 066 should be (shown|not shown) against the metadata file$/) do |show_warning|
-  expect_warning("FC066", :file => "metadata.rb", :expect_warning => show_warning == "shown")
-end
-
-Given(/^a cookbook with metadata that (includes|does not include) a supports keyword$/) do |includes|
-  write_metadata %Q{
-    #{"supports 'debian'" if includes == 'includes'}
-  }
-end
-
-Then(/^the metadata missing supports warning 067 should be (shown|not shown) against the metadata file$/) do |show_warning|
-  expect_warning("FC067", :file => "metadata.rb", :expect_warning => show_warning == "shown")
-end
-
-Given(/^a cookbook with metadata that (includes|does not include) a license keyword$/) do |includes|
-  write_metadata %Q{
-    #{"license 'Apache-2.0'" if includes == 'includes'}
-  }
-end
-
-Then(/^the metadata missing license warning 068 should be (shown|not shown) against the metadata file$/) do |show_warning|
-  expect_warning("FC068", :file => "metadata.rb", :expect_warning => show_warning == "shown")
-end