berkshelf 2.0.18 → 3.0.0.beta1

data/features/step_definitions/gem_steps.rb

@@ -1,6 +1,5 @@
 Given /^the gem "(.*)" is not installed$/ do |gem_name|
-  # @see berkshelf/test.rb
-  set_env 'MISSING_GEMS', [ENV['MISSING_GEMS'], gem_name].compact.join(',')
+  Gem::Specification.stub(:find_by_name).with(gem_name).and_raise(Gem::LoadError)
 end
 
 Then /^the output should contain a warning to suggest supporting the option "(.*?)" by installing "(.*?)"$/ do |option, gem_name|

data/features/step_definitions/json_steps.rb

@@ -5,7 +5,9 @@ class Hash
       if seed[key].is_a?(Hash)
         seed[key] = seed[key].sort_by_key(&block)
       elsif seed[key].is_a?(Array)
-        seed[key] = seed[key].map { |i| i.sort_by_key(&block) }
+        seed[key] = seed[key].map do |i|
+          i.respond_to?(:sort_by_key) ? i.sort_by_key(&block) : i
+        end
       end
       seed
     end

data/features/step_definitions/lockfile_steps.rb

@@ -0,0 +1,4 @@
+Then(/^the output should warn about the old lockfile format$/) do
+  message = Berkshelf::Lockfile.class_eval('LockfileLegacy.send(:warning_message)')
+  expect(all_output).to include(message)
+end

data/features/step_definitions/utility_steps.rb

@@ -2,27 +2,8 @@ Given /^pending\s+"([^\"]+)"$/ do |msg|
   pending
 end
 
-Given(/^the BERKSHELF_EDITOR and VISUAL environment variables are not set$/) do
-  set_env "BERKSHELF_EDITOR", nil
-  set_env "VISUAL", nil
-end
-
-Given /^the environment variable (.+) is nil$/ do |variable|
-  set_env variable, nil
-end
-
-Given /^the environment variable (.+) is "(.+)"$/ do |variable, value|
-  set_env variable, value
-end
-
 Then /^the output should be the same as \`(.+)\`$/ do |command|
   run_simple(command)
   output = output_from(command)
   expect(all_output).to include(output)
 end
-
-# The built-in regex matcher does not support multi-line matching :(
-Then /^the output should match multiline:$/ do |expected|
-  regex = Regexp.new(expected.strip, Regexp::MULTILINE)
-  expect(regex).to match(all_output)
-end

data/features/support/aruba.rb

@@ -0,0 +1,12 @@
+module Aruba
+  # Force Aruba to behave like the SpawnProcess Aruba class.
+  class InProcess
+    def stdin
+      @stdin
+    end
+
+    def output
+      stdout + stderr
+    end
+  end
+end

data/features/support/env.rb

@@ -1,78 +1,73 @@
-require 'rubygems'
-require 'bundler'
 require 'spork'
 
 Spork.prefork do
-  require 'rspec'
-  require 'pp'
   require 'aruba/cucumber'
+  require 'aruba/in_process'
+  require 'aruba/spawn_process'
+  require 'cucumber/rspec/doubles'
+  require 'berkshelf/api/rspec'
+  require 'berkshelf/api/cucumber'
 
-  APP_ROOT = File.expand_path('../../../', __FILE__)
+  Dir['spec/support/**/*.rb'].each { |f| require File.expand_path(f) }
 
-  ENV['RUBY_ENV'] = 'test'
-  ENV['BERKSHELF_PATH'] = File.join(APP_ROOT, 'tmp', 'berkshelf')
-  ENV['BERKSHELF_CHEF_CONFIG'] = File.join(APP_ROOT, 'spec', 'config', 'knife.rb')
+  World(Berkshelf::RSpec::PathHelpers)
+  World(Berkshelf::RSpec::Kitchen)
 
-  # Workaround for RSA Fingerprint prompt in Travis CI
-  git_ssh_path = '/tmp/git_ssh.sh'
-  unless File.exist? git_ssh_path
-    git_ssh = File.new(git_ssh_path, 'w+')
-    git_ssh.puts 'ssh -o UserKnownHostsFile=/dev/null -o StrictHostKeyChecking=no $1 $2'
-    git_ssh.chmod 0775
-    git_ssh.flush
-    git_ssh.close
-  end
-
-  ENV['GIT_SSH'] = git_ssh_path
-
-  Dir[File.join(APP_ROOT, 'spec/support/**/*.rb')].each {|f| require f}
-
-  World(Berkshelf::TestGenerators)
-
-  Before do
-    set_env 'RUBY_ENV', 'test'
-    clean_cookbook_store
-    generate_berks_config(File.join(ENV['BERKSHELF_PATH'], 'config.json'))
-    @aruba_io_wait_seconds = 5
-    @aruba_timeout_seconds = 30
-  end
-
-  Before('@slow_process') do
-    @aruba_timeout_seconds = 60
-    @aruba_io_wait_seconds = 30
-  end
-
-  # Chef Zero
-  require 'chef_zero/server'
-  @server = ChefZero::Server.new(port: 4000, generate_real_keys: false)
-  @server.start_background
+  CHEF_SERVER_PORT = 26310
+  BERKS_API_PORT   = 26210
 
   at_exit do
-    @server.stop if @server && @server.running?
-  end
-
-  def cookbook_store
-    Pathname.new(File.join(ENV['BERKSHELF_PATH'], 'cookbooks'))
+    Berkshelf::RSpec::ChefServer.stop
+    Berkshelf::API::RSpec::Server.stop
   end
 
-  def clean_cookbook_store
-    FileUtils.rm_rf(cookbook_store)
-    FileUtils.mkdir_p(cookbook_store)
+  Before do
+    # Legacy ENV variables until we can move over to all InProcess
+    ENV['BERKSHELF_PATH'] = berkshelf_path.to_s
+    ENV['BERKSHELF_CONFIG'] = Berkshelf.config.path.to_s
+    ENV['BERKSHELF_CHEF_CONFIG'] = chef_config_path.to_s
+
+    Aruba::InProcess.main_class = Berkshelf::Cli::Runner
+    Aruba.process               = Aruba::InProcess
+
+    stub_kitchen!
+    clean_tmp_path
+    Berkshelf.initialize_filesystem
+    Berkshelf::CookbookStore.instance.initialize_filesystem
+    reload_configs
+
+    endpoints = [
+      {
+        type: "chef_server",
+        options: {
+          url: "http://localhost:#{CHEF_SERVER_PORT}",
+          client_name: "reset",
+          client_key: fixtures_path.join("reset.pem")
+        }
+      }
+    ]
+
+    Berkshelf::RSpec::ChefServer.start(port: CHEF_SERVER_PORT)
+    Berkshelf::API::RSpec::Server.start(port: BERKS_API_PORT, endpoints: endpoints)
+
+    @aruba_io_wait_seconds = Cucumber::JRUBY ? 7 : 5
+    @aruba_timeout_seconds = Cucumber::JRUBY ? 35 : 15
   end
 
-  def app_root_path
-    Pathname.new(APP_ROOT)
-  end
+  Before('@spawn') do
+    Aruba.process = Aruba::SpawnProcess
 
-  def tmp_path
-    app_root_path.join('spec/tmp')
+    set_env('BERKSHELF_PATH', berkshelf_path.to_s)
+    set_env('BERKSHELF_CONFIG', Berkshelf.config.path.to_s)
+    set_env('BERKSHELF_CHEF_CONFIG', chef_config_path.to_s)
   end
 
-  def fixtures_path
-    app_root_path.join('spec/fixtures')
+  Before('@slow_process') do
+    @aruba_io_wait_seconds = Cucumber::JRUBY ? 70 : 30
+    @aruba_timeout_seconds = Cucumber::JRUBY ? 140 : 60
   end
 end
 
 Spork.each_run do
-  require 'berkshelf'
+  require 'berkshelf/cli'
 end

data/features/update_command.feature

@@ -8,7 +8,8 @@ Feature: Updating a cookbook defined by a Berksfile
       | berkshelf-cookbook-fixture | 0.1.0 |
     And I write to "Berksfile" with:
       """
-      site :opscode
+      source "http://localhost:26210"
+
       cookbook 'berkshelf-cookbook-fixture', '~> 0.1'
       """
     And I write to "Berksfile.lock" with:
@@ -16,13 +17,14 @@ Feature: Updating a cookbook defined by a Berksfile
       cookbook 'berkshelf-cookbook-fixture', :locked_version => '0.1.0'
       """
     When I successfully run `berks update`
-    Then the output should contain "You are using the old lockfile format. Attempting to convert..."
+    Then the output should warn about the old lockfile format
     Then the file "Berksfile.lock" should contain JSON:
       """
       {
-        "sources":{
+        "dependencies":{
           "berkshelf-cookbook-fixture":{
-            "locked_version":"0.1.0"
+            "locked_version":"0.1.0",
+            "constraint":"~> 0.1"
           }
         }
       }
@@ -35,19 +37,22 @@ Feature: Updating a cookbook defined by a Berksfile
       | hostsfile                  | 1.0.1 |
     And I write to "Berksfile" with:
       """
-      site :opscode
+      source "http://localhost:26210"
+
       cookbook 'berkshelf-cookbook-fixture', '~> 0.1'
       cookbook 'hostsfile', '~> 1.0.0'
       """
     And I write to "Berksfile.lock" with:
       """
       {
-        "sources":{
+        "dependencies":{
           "berkshelf-cookbook-fixture":{
-            "locked_version":"0.1.0"
+            "locked_version":"0.1.0",
+            "constraint":"~> 0.1"
           },
           "hostsfile":{
-            "locked_version":"1.0.1"
+            "locked_version":"1.0.1",
+            "constraint":"= 1.0.1"
           }
         }
       }
@@ -56,12 +61,14 @@ Feature: Updating a cookbook defined by a Berksfile
     Then the file "Berksfile.lock" should contain JSON:
       """
       {
-        "sources":{
+        "dependencies":{
           "berkshelf-cookbook-fixture":{
-            "locked_version":"0.2.0"
+            "locked_version":"0.2.0",
+            "constraint":"~> 0.1"
           },
           "hostsfile":{
-            "locked_version":"1.0.1"
+            "locked_version":"1.0.1",
+            "constraint":"~> 1.0.0"
           }
         }
       }
@@ -74,19 +81,22 @@ Feature: Updating a cookbook defined by a Berksfile
       | hostsfile                  | 1.0.1 |
     Given I write to "Berksfile" with:
       """
-      site :opscode
+      source "http://localhost:26210"
+
       cookbook 'berkshelf-cookbook-fixture', '~> 0.1'
       cookbook 'hostsfile', '~> 1.0.0'
       """
     And I write to "Berksfile.lock" with:
       """
       {
-        "sources":{
+        "dependencies":{
           "berkshelf-cookbook-fixture":{
-            "locked_version":"0.1.0"
+            "locked_version":"0.1.0",
+            "constraint":"~> 0.1"
           },
           "hostsfile":{
-            "locked_version":"1.0.0"
+            "locked_version":"1.0.0",
+            "constraint":"~> 1.0.0"
           }
         }
       }
@@ -95,12 +105,14 @@ Feature: Updating a cookbook defined by a Berksfile
     Then the file "Berksfile.lock" should contain JSON:
       """
       {
-        "sources":{
+        "dependencies":{
           "berkshelf-cookbook-fixture":{
-            "locked_version":"0.2.0"
+            "locked_version":"0.2.0",
+            "constraint":"~> 0.1"
           },
           "hostsfile":{
-            "locked_version":"1.0.0"
+            "locked_version":"1.0.0",
+            "constraint":"~> 1.0.0"
           }
         }
       }
@@ -111,15 +123,17 @@ Feature: Updating a cookbook defined by a Berksfile
       | berkshelf-cookbook-fixture | 0.1.0 |
     Given I write to "Berksfile" with:
       """
-      site :opscode
+      source "http://localhost:26210"
+
       cookbook 'berkshelf-cookbook-fixture', '~> 0.1'
       """
     Given I write to "Berksfile.lock" with:
       """
       {
-        "sources":{
+        "dependencies":{
           "berkshelf-cookbook-fixture":{
-            "locked_version":"0.1.0"
+            "locked_version":"0.1.0",
+            "constraint":"~> 0.1"
           }
         }
       }
@@ -127,6 +141,6 @@ Feature: Updating a cookbook defined by a Berksfile
     When I run `berks update non-existent-cookbook`
     Then the output should contain:
       """
-      Could not find cookbooks 'non-existent-cookbook' in any of the sources. Is it in your Berksfile?
+      Could not find cookbook(s) 'non-existent-cookbook' in any of the configured dependencies. Is it in your Berksfile?
       """
-    And the CLI should exit with the status code for error "CookbookNotFound"
+    And the exit status should be "CookbookNotFound"

data/features/upload_command.feature

@@ -1,139 +1,146 @@
 Feature: Uploading cookbooks to a Chef Server
   As a Berkshelf CLI user
-  I need a way to upload cookbooks to a Chef server that I have installed into my Bookshelf
+  I need a way to upload cookbooks to a Chef Server that I have installed into my Bookshelf
   So they are available to Chef clients
 
-  @chef_server @slow_process
-  Scenario: With no arguments
+  Background:
+    Given the Berkshelf API server's cache is empty
+    And the Chef Server is empty
+    And the cookbook store is empty
+
+  Scenario: multiple cookbooks with no arguments
     Given the cookbook store has the cookbooks:
-      | fake | 1.0.0 |
-      | ekaf | 2.0.0 |
+      | ruby   | 1.0.0 |
+      | elixir | 2.0.0 |
     And I write to "Berksfile" with:
       """
-      cookbook 'fake', '1.0.0'
-      cookbook 'ekaf', '2.0.0'
+      source "http://localhost:26210"
+
+      cookbook 'ruby', '1.0.0'
+      cookbook 'elixir', '2.0.0'
       """
-    And the Chef server does not have the cookbooks:
-      | fake   | 1.0.0 |
-      | ekaf   | 2.0.0 |
     When I successfully run `berks upload`
     Then the output should contain:
       """
-      Uploading fake (1.0.0) to: 'http://localhost:4000/'
-      Uploading ekaf (2.0.0) to: 'http://localhost:4000/'
+      Uploading ruby (1.0.0) to: 'http://localhost:26310/'
+      Uploading elixir (2.0.0) to: 'http://localhost:26310/'
       """
-    And the Chef server should have the cookbooks:
-      | fake   | 1.0.0 |
-      | ekaf   | 2.0.0 |
-    And the exit status should be 0
+    And the Chef Server should have the cookbooks:
+      | ruby   | 1.0.0 |
+      | elixir | 2.0.0 |
 
-  @chef_server
-  Scenario: With a path location in the Berksfile
-    Given a cookbook named "fake"
+  Scenario: a cookbook with a path location
+    Given a cookbook named "ruby"
     And I write to "Berksfile" with:
       """
-      cookbook 'fake', path: './fake'
+      source "http://localhost:26210"
+
+      cookbook 'ruby', path: './ruby'
       """
-    And the Chef server does not have the cookbooks:
-      | fake | 0.0.0 |
     When I successfully run `berks upload`
     Then the output should contain:
       """
-      Uploading fake (0.0.0) to: 'http://localhost:4000/'
+      Uploading ruby (0.0.0) to: 'http://localhost:26310/'
       """
-    And the Chef server should have the cookbooks:
-      | fake | 0.0.0 |
-    And the exit status should be 0
+    And the Chef Server should have the cookbooks:
+      | ruby | 0.0.0 |
 
-  @chef_server
-  Scenario: With a git location in the Berksfile
+  Scenario: a cookbook with a git location
     Given the cookbook store has the cookbooks:
       | berkshelf-cookbook-fixture | 0.1.0 |
     And I write to "Berksfile" with:
       """
+      source "http://localhost:26210"
+
       cookbook 'berkshelf-cookbook-fixture', ref: 'v0.1.0'
       """
-    And the Chef server does not have the cookbooks:
-      | berkshelf-cookbook-fixture | 0.1.0 |
     When I successfully run `berks upload`
     Then the output should contain:
       """
-      Uploading berkshelf-cookbook-fixture (0.1.0) to: 'http://localhost:4000/'
+      Uploading berkshelf-cookbook-fixture (0.1.0) to: 'http://localhost:26310/'
       """
-    And the Chef server should have the cookbooks:
+    And the Chef Server should have the cookbooks:
       | berkshelf-cookbook-fixture | 0.1.0 |
-    And the exit status should be 0
 
-  @chef_server @slow_process
-  Scenario: With a single cookbook
+  Scenario: specifying a single cookbook with dependencies
     Given the cookbook store has the cookbooks:
       | fake  | 1.0.0 |
       | ekaf  | 2.0.0 |
     And the cookbook store contains a cookbook "reset" "3.4.5" with dependencies:
-      | fake | ~> 1.0.0 |
+      | fake | = 1.0.0 |
     And I write to "Berksfile" with:
       """
+      source "http://localhost:26210"
+
       cookbook 'fake', '1.0.0'
       cookbook 'ekaf', '2.0.0'
       cookbook 'reset', '3.4.5'
       """
-    And the Chef server does not have the cookbooks:
-      | fake  | 1.0.0 |
-      | ekaf  | 2.0.0 |
-      | reset | 3.4.5 |
     When I successfully run `berks upload reset`
     Then the output should contain:
       """
-      Uploading reset (3.4.5) to: 'http://localhost:4000/'
-      Uploading fake (1.0.0) to: 'http://localhost:4000/'
+      Uploading reset (3.4.5) to: 'http://localhost:26310/'
+      Uploading fake (1.0.0) to: 'http://localhost:26310/'
+      """
+    And the output should not contain:
+      """
+      Uploading ekaf (2.0.0) to: 'http://localhost:26310/'
       """
-    And the Chef server should have the cookbooks:
+    And the Chef Server should have the cookbooks:
       | reset | 3.4.5 |
       | fake  | 1.0.0 |
-    And the Chef server should not have the cookbooks:
+    And the Chef Server should not have the cookbooks:
       | ekaf  | 2.0.0 |
-    And the exit status should be 0
 
-  @chef_server @slow_process
-  Scenario: With multiple cookbooks
+  Scenario: specifying a dependency not defined in the Berksfile
+    Given I write to "Berksfile" with:
+      """
+      source "http://localhost:26210"
+      """
+    When I run `berks upload reset`
+    Then the output should contain:
+      """
+      Failed to upload cookbook 'reset'. Not defined in Berksfile.
+      """
+    And the exit status should be "DependencyNotFound"
+
+  Scenario: specifying multiple cookbooks to upload
     Given the cookbook store has the cookbooks:
       | ntp  | 1.0.0 |
       | vim  | 1.0.0 |
       | apt  | 1.0.0 |
     Given I write to "Berksfile" with:
       """
+      source "http://localhost:26210"
+
+      cookbook 'apt', '1.0.0'
       cookbook 'ntp', '1.0.0'
       cookbook 'vim', '1.0.0'
-      cookbook 'apt', '1.0.0'
       """
-    And the Chef server does not have the cookbooks:
-      | ntp |
-      | vim |
-      | apt |
     When I successfully run `berks upload ntp vim`
     Then the output should contain:
       """
-      Uploading ntp (1.0.0) to: 'http://localhost:4000/'
-      Uploading vim (1.0.0) to: 'http://localhost:4000/'
+      Uploading ntp (1.0.0) to: 'http://localhost:26310/'
+      Uploading vim (1.0.0) to: 'http://localhost:26310/'
       """
     And the output should not contain:
       """
-      Uploading apt (1.0.0) to: 'http://localhost:4000/'
+      Uploading apt (1.0.0) to: 'http://localhost:26310/'
       """
-    And the Chef server should have the cookbooks:
+    And the Chef Server should have the cookbooks:
       | ntp |
       | vim |
-    And the Chef server should not have the cookbooks:
+    And the Chef Server should not have the cookbooks:
       | apt |
-    And the exit status should be 0
 
-  @chef_server @slow_process
-  Scenario: With the --only flag
+  Scenario: uploading a single groups of demands with the --only flag
     Given the cookbook store has the cookbooks:
       | core    | 1.0.0 |
       | system  | 1.0.0 |
     Given I write to "Berksfile" with:
       """
+      source "http://localhost:26210"
+
       group :group_a do
         cookbook 'core', '1.0.0'
       end
@@ -142,31 +149,28 @@ Feature: Uploading cookbooks to a Chef Server
         cookbook 'system', '1.0.0'
       end
       """
-    And the Chef server does not have the cookbooks:
-      | core   | 1.0.0 |
-      | system | 1.0.0 |
     When I successfully run `berks upload --only group_a`
     Then the output should contain:
       """
-      Uploading core (1.0.0) to: 'http://localhost:4000/'
+      Uploading core (1.0.0) to: 'http://localhost:26310/'
       """
     And the output should not contain:
       """
-      Uploading system (1.0.0) to: 'http://localhost:4000/'
+      Uploading system (1.0.0) to: 'http://localhost:26310/'
       """
-    And the Chef server should have the cookbooks:
+    And the Chef Server should have the cookbooks:
       | core | 1.0.0 |
-    And the Chef server should not have the cookbooks:
+    And the Chef Server should not have the cookbooks:
       | system | 1.0.0 |
-    And the exit status should be 0
 
-  @chef_server @slow_process
-  Scenario: With the --only flag specifying multiple groups
+  Scenario: uploading multiple groups of demands with the --only flag
     Given the cookbook store has the cookbooks:
       | core    | 1.0.0 |
       | system  | 1.0.0 |
     Given I write to "Berksfile" with:
       """
+      source "http://localhost:26210"
+
       group :group_a do
         cookbook 'core', '1.0.0'
       end
@@ -175,27 +179,24 @@ Feature: Uploading cookbooks to a Chef Server
         cookbook 'system', '1.0.0'
       end
       """
-    And the Chef server does not have the cookbooks:
-      | core   | 1.0.0 |
-      | system | 1.0.0 |
     When I successfully run `berks upload --only group_a group_b`
     Then the output should contain:
       """
-      Uploading core (1.0.0) to: 'http://localhost:4000/'
-      Uploading system (1.0.0) to: 'http://localhost:4000/'
+      Uploading core (1.0.0) to: 'http://localhost:26310/'
+      Uploading system (1.0.0) to: 'http://localhost:26310/'
       """
-    And the Chef server should have the cookbooks:
+    And the Chef Server should have the cookbooks:
       | core   | 1.0.0 |
       | system | 1.0.0 |
-    And the exit status should be 0
 
-  @chef_server @slow_process
-  Scenario: With the --except flag
+  Scenario: skipping a single group to upload with the --except flag
     Given the cookbook store has the cookbooks:
       | core    | 1.0.0 |
       | system  | 1.0.0 |
     Given I write to "Berksfile" with:
       """
+      source "http://localhost:26210"
+
       group :group_a do
         cookbook 'core', '1.0.0'
       end
@@ -204,31 +205,28 @@ Feature: Uploading cookbooks to a Chef Server
         cookbook 'system', '1.0.0'
       end
       """
-    And the Chef server does not have the cookbooks:
-      | core   | 1.0.0 |
-      | system | 1.0.0 |
     When I successfully run `berks upload --except group_b`
     Then the output should contain:
       """
-      Uploading core (1.0.0) to: 'http://localhost:4000/'
+      Uploading core (1.0.0) to: 'http://localhost:26310/'
       """
     And the output should not contain:
       """
-      Uploading system (1.0.0) to: 'http://localhost:4000/'
+      Uploading system (1.0.0) to: 'http://localhost:26310/'
       """
-    And the Chef server should have the cookbooks:
+    And the Chef Server should have the cookbooks:
       | core | 1.0.0 |
-    And the Chef server should not have the cookbooks:
+    And the Chef Server should not have the cookbooks:
       | system | 1.0.0 |
-    And the exit status should be 0
 
-  @chef_server @slow_process
-  Scenario: With the --except flag specifying multiple groups
+  Scenario: skipping multiple groups with the --except flag
     Given the cookbook store has the cookbooks:
       | core    | 1.0.0 |
       | system  | 1.0.0 |
     Given I write to "Berksfile" with:
       """
+      source "http://localhost:26210"
+
       group :group_a do
         cookbook 'core', '1.0.0'
       end
@@ -237,24 +235,22 @@ Feature: Uploading cookbooks to a Chef Server
         cookbook 'system', '1.0.0'
       end
       """
-    And the Chef server does not have the cookbooks:
-      | core   | 1.0.0 |
-      | system | 1.0.0 |
     When I successfully run `berks upload --except group_a group_b`
     Then the output should not contain:
       """
-      Uploading core (1.0.0) to: 'http://localhost:4000/'
-      Uploading system (1.0.0) to: 'http://localhost:4000/'
+      Uploading core (1.0.0) to: 'http://localhost:26310/'
+      Uploading system (1.0.0) to: 'http://localhost:26310/'
       """
-    And the Chef server should not have the cookbooks:
+    And the Chef Server should not have the cookbooks:
       | core   | 1.0.0 |
       | system | 1.0.0 |
-    And the exit status should be 0
 
-  Scenario: With an invalid cookbook
+  Scenario: attempting to upload an invalid cookbook
     Given a cookbook named "cookbook with spaces"
     And I write to "Berksfile" with:
       """
+      source "http://localhost:26210"
+
       cookbook 'cookbook with spaces', path: './cookbook with spaces'
       """
     When I run `berks upload`
@@ -262,39 +258,8 @@ Feature: Uploading cookbooks to a Chef Server
       """
       The cookbook 'cookbook with spaces' has invalid filenames:
       """
-    And the CLI should exit with the status code for error "InvalidCookbookFiles"
+    And the exit status should be "InvalidCookbookFiles"
 
-    @chef_server @slow_process
-  Scenario: With the --skip-dependencies flag
-    Given the cookbook store has the cookbooks:
-      | fake  | 1.0.0 |
-      | ekaf  | 2.0.0 |
-    And the cookbook store contains a cookbook "reset" "3.4.5" with dependencies:
-      | fake | ~> 1.0.0 |
-    And I write to "Berksfile" with:
-      """
-      cookbook 'fake', '1.0.0'
-      cookbook 'ekaf', '2.0.0'
-      cookbook 'reset', '3.4.5'
-      """
-    And the Chef server does not have the cookbooks:
-      | fake  | 1.0.0 |
-      | ekaf  | 2.0.0 |
-      | reset | 3.4.5 |
-    When I successfully run `berks upload reset -D`
-    Then the output should contain:
-      """
-      Uploading reset (3.4.5) to: 'http://localhost:4000/'
-      Uploading fake (1.0.0) to: 'http://localhost:4000/'
-      """
-    And the Chef server should have the cookbooks:
-      | reset | 3.4.5 |
-      | fake  | 1.0.0 |
-    And the Chef server should not have the cookbooks:
-      | ekaf  | 2.0.0 |
-    And the exit status should be 0
-
-  @focus
   Scenario: With unicode characters
     Given a cookbook named "fake"
     And the cookbook "fake" has the file "README.md" with:
@@ -306,7 +271,8 @@ Feature: Uploading cookbooks to a Chef Server
       """
     And the cookbook "fake" has the file "Berksfile" with:
       """
-      site :opscode
+      source "http://localhost:26210"
+
       metadata
       """
     When I cd to "fake"
@@ -315,33 +281,3 @@ Feature: Uploading cookbooks to a Chef Server
       """
       Uploading fake (0.0.0)
       """
-    And the exit status should be 0
-  Scenario: When the syntax check is skipped
-    Given a cookbook named "fake"
-    And the cookbook "fake" has the file "recipes/default.rb" with:
-      """
-      Totally not valid Ruby syntax
-      """
-    And the cookbook "fake" has the file "templates/default/file.erb" with:
-      """
-      <% for %>
-      """
-    And the cookbook "fake" has the file "recipes/template.rb" with:
-      """
-      template "/tmp/wadus" do
-        source "file.erb"
-      end
-      """
-    And the cookbook "fake" has the file "Berksfile" with:
-      """
-      site :opscode
-
-      metadata
-      """
-    And I cd to "fake"
-    When I successfully run `berks upload --skip-syntax-check`
-    Then the output should contain:
-      """
-      Using fake (0.0.0) from metadata
-      Uploading fake (0.0.0) to: 'http://localhost:4000/'
-      """