Skip to content

Commit

Permalink
Fix failing features
Browse files Browse the repository at this point in the history
  • Loading branch information
sethvargo committed Oct 25, 2014
1 parent 607a5cd commit a3279d3
Show file tree
Hide file tree
Showing 2 changed files with 16 additions and 16 deletions.
2 changes: 1 addition & 1 deletion features/commands/search.feature
Expand Up @@ -10,7 +10,7 @@ Feature: berks search
* I successfully run `berks search berkshelf-`
* the output should contain:
"""
berkshelf-api (1.0.0)
berkshelf-api (1.2.2)
berkshelf-api-server (2.1.0)
berkshelf-cookbook-fixture (1.0.0)
"""
30 changes: 15 additions & 15 deletions features/config.feature
Expand Up @@ -3,8 +3,8 @@ Feature: Reading a Berkshelf configuration file
When I successfully run `berks cookbook sparkle_motion`
Then the resulting "sparkle_motion" Vagrantfile should contain:
| config.omnibus.chef_version = :latest |
| config.vm.box = "chef/ubuntu-14.04" |
| config.vm.box_url = "https://vagrantcloud.com/chef/ubuntu-14.04/version/1/provider/virtualbox.box" |
| config.vm.box = 'chef/ubuntu-14.04' |
| config.vm.box_url = 'https://vagrantcloud.com/chef/ubuntu-14.04/version/1/provider/virtualbox.box' |

Scenario: Using a Berkshelf configuration file that disables the vagrant-omnibus plugin
Given I have a Berkshelf config file containing:
Expand All @@ -28,10 +28,10 @@ Feature: Reading a Berkshelf configuration file
When I successfully run `berks cookbook sparkle_motion`
Then the resulting "sparkle_motion" Vagrantfile should contain:
| #config.omnibus.chef_version = :latest |
| config.vm.box = "my_box" |
| config.vm.box_url = "http://files.vagrantup.com/lucid64.box" |
| config.vm.box = 'my_box' |
| config.vm.box_url = 'http://files.vagrantup.com/lucid64.box' |
| config.vm.network :forwarded_port, guest: 12345, host: 54321 |
| config.vm.network :private_network, type: "dhcp" |
| config.vm.network :private_network, type: 'dhcp' |
And the exit status should be 0

Scenario: Using a Berkshelf configuration file that sets the vagrant-omnibus plugin chef version
Expand All @@ -55,11 +55,11 @@ Feature: Reading a Berkshelf configuration file
"""
When I successfully run `berks cookbook sparkle_motion`
Then the resulting "sparkle_motion" Vagrantfile should contain:
| config.omnibus.chef_version = "11.4.4" |
| config.vm.box = "my_box" |
| config.vm.box_url = "http://files.vagrantup.com/lucid64.box" |
| config.omnibus.chef_version = '11.4.4' |
| config.vm.box = 'my_box' |
| config.vm.box_url = 'http://files.vagrantup.com/lucid64.box' |
| config.vm.network :forwarded_port, guest: 12345, host: 54321 |
| config.vm.network :private_network, type: "dhcp" |
| config.vm.network :private_network, type: 'dhcp' |
And the exit status should be 0

Scenario: Using a Berkshelf configuration file that sets the vagrant-omnibus plugin chef version to latest
Expand All @@ -84,10 +84,10 @@ Feature: Reading a Berkshelf configuration file
When I successfully run `berks cookbook sparkle_motion`
Then the resulting "sparkle_motion" Vagrantfile should contain:
| config.omnibus.chef_version = :latest |
| config.vm.box = "my_box" |
| config.vm.box_url = "http://files.vagrantup.com/lucid64.box" |
| config.vm.box = 'my_box' |
| config.vm.box_url = 'http://files.vagrantup.com/lucid64.box' |
| config.vm.network :forwarded_port, guest: 12345, host: 54321 |
| config.vm.network :private_network, type: "dhcp" |
| config.vm.network :private_network, type: 'dhcp' |

Scenario: Using a partial Berkshelf configuration file
Given I have a Berkshelf config file containing:
Expand Down Expand Up @@ -141,6 +141,6 @@ Feature: Reading a Berkshelf configuration file
When I successfully run `berks cookbook sparkle_motion`
Then the resulting "sparkle_motion" Vagrantfile should contain:
| config.vm.provision :chef_client |
| chef.chef_server_url = "localhost:4000" |
| chef.validation_client_name = "my_client-validator" |
| chef.validation_key_path = "/a/b/c/my_client-validator.pem" |
| chef.chef_server_url = 'localhost:4000' |
| chef.validation_client_name = 'my_client-validator' |
| chef.validation_key_path = '/a/b/c/my_client-validator.pem' |

0 comments on commit a3279d3

Please sign in to comment.