summaryrefslogtreecommitdiff
path: root/features
diff options
context:
space:
mode:
authorChristian Paredes <cp@redbluemagenta.com>2010-10-13 16:25:34 -0700
committerDaniel DeLeo <dan@opscode.com>2010-11-08 12:51:57 -0800
commit1ff0a9251268d05a5d33d6684322d1840d5f3e04 (patch)
tree70f4c0bd2146262e374e2c9169bc007553363727 /features
parent0676b9d2bd26f19bafa6ed83062401c9c8dc7e36 (diff)
downloadchef-1ff0a9251268d05a5d33d6684322d1840d5f3e04.tar.gz
Replacing tabs with two spaces.
Diffstat (limited to 'features')
-rw-r--r--features/api/cookbooks/list_cookbooks.feature2
-rw-r--r--features/api/roles/create_role_api.feature2
-rw-r--r--features/api/roles/update_roles_api.feature2
-rw-r--r--features/data/cookbooks/delayed_notifications/recipes/notify_a_resource_from_a_single_source.rb2
-rw-r--r--features/data/cookbooks/deploy/recipes/callbacks.rb2
-rw-r--r--features/data/cookbooks/deploy/recipes/embedded_recipe_callbacks.rb2
-rw-r--r--features/data/cookbooks/integration_setup/attributes/integration.rb2
-rw-r--r--features/data/cookbooks/manage_files/recipes/create_a_file.rb2
-rw-r--r--features/data/cookbooks/manage_files/recipes/delete_a_file.rb2
-rw-r--r--features/data/cookbooks/manage_files/recipes/delete_a_file_that_does_not_already_exist.rb2
-rw-r--r--features/data/cookbooks/manage_files/recipes/set_the_owner_of_a_created_file.rb2
-rw-r--r--features/data/cookbooks/manage_files/recipes/touch_a_file.rb2
-rw-r--r--features/data/cookbooks/packages/recipes/gem_package.rb2
-rw-r--r--features/data/cookbooks/packages/recipes/install_gem_noshell.rb2
-rw-r--r--features/data/cookbooks/packages/recipes/manually_upgrade_gem_package.rb2
-rw-r--r--features/data/cookbooks/packages/recipes/upgrade_gem_noshell.rb2
-rw-r--r--features/data/cookbooks/packages/recipes/upgrade_gem_package.rb2
-rw-r--r--features/data/cookbooks/transfer_remote_files/recipes/should_prefer_the_file_for_this_specific_host.rb2
-rw-r--r--features/data/cookbooks/transfer_remote_files/recipes/transfer_a_file_from_a_cookbook.rb2
-rw-r--r--features/data/cookbooks_not_uploaded_at_feature_start/testcookbook_valid_v0.1.0_with_different_dependencies/metadata.rb2
-rw-r--r--features/data/cookbooks_not_uploaded_at_feature_start/version_test_0.1.0/metadata.rb2
-rw-r--r--features/data/cookbooks_not_uploaded_at_feature_start/version_test_0.1.1/metadata.rb2
-rw-r--r--features/data/cookbooks_not_uploaded_at_feature_start/version_test_0.10.0/metadata.rb2
-rw-r--r--features/data/cookbooks_not_uploaded_at_feature_start/version_test_0.2.0/metadata.rb2
-rw-r--r--features/data/cookbooks_not_uploaded_at_feature_start/version_test_0.9.0/metadata.rb2
-rw-r--r--features/data/cookbooks_not_uploaded_at_feature_start/version_test_0.9.7/metadata.rb2
-rw-r--r--features/steps/cookbook_steps.rb2
-rw-r--r--features/steps/packages.rb2
28 files changed, 27 insertions, 29 deletions
diff --git a/features/api/cookbooks/list_cookbooks.feature b/features/api/cookbooks/list_cookbooks.feature
index cdbc7f98a4..0c5bfa296c 100644
--- a/features/api/cookbooks/list_cookbooks.feature
+++ b/features/api/cookbooks/list_cookbooks.feature
@@ -43,4 +43,4 @@ Feature: List cookbooks via the REST API
Scenario: List cookbooks with a wrong private key
Given I am an administrator
When I 'GET' the path '/cookbooks' using a wrong private key
- Then I should get a '401 "Unauthorized"' exception \ No newline at end of file
+ Then I should get a '401 "Unauthorized"' exception
diff --git a/features/api/roles/create_role_api.feature b/features/api/roles/create_role_api.feature
index d74533c3a4..9b2654dfa6 100644
--- a/features/api/roles/create_role_api.feature
+++ b/features/api/roles/create_role_api.feature
@@ -35,4 +35,4 @@ Feature: Create a role via the REST API
When I 'POST' the 'role' to the path '/roles'
Then the inflated responses key 'uri' should match '^http://.+/roles/role_not_exist$'
When I 'GET' the path '/roles/role_not_exist'
- Then the stringified response should be the stringified 'role' \ No newline at end of file
+ Then the stringified response should be the stringified 'role'
diff --git a/features/api/roles/update_roles_api.feature b/features/api/roles/update_roles_api.feature
index 530608ce76..21376a3618 100644
--- a/features/api/roles/update_roles_api.feature
+++ b/features/api/roles/update_roles_api.feature
@@ -41,4 +41,4 @@ Feature: Update a role
When I 'PUT' the 'role' to the path '/roles/webserver'
Then the inflated response should respond to 'run_list' with '["role[not_exist]"]'
When I 'GET' the path '/roles/webserver'
- Then the inflated response should respond to 'run_list' with '["role[not_exist]"]' \ No newline at end of file
+ Then the inflated response should respond to 'run_list' with '["role[not_exist]"]'
diff --git a/features/data/cookbooks/delayed_notifications/recipes/notify_a_resource_from_a_single_source.rb b/features/data/cookbooks/delayed_notifications/recipes/notify_a_resource_from_a_single_source.rb
index 9b4d383730..9ab2a9a6fe 100644
--- a/features/data/cookbooks/delayed_notifications/recipes/notify_a_resource_from_a_single_source.rb
+++ b/features/data/cookbooks/delayed_notifications/recipes/notify_a_resource_from_a_single_source.rb
@@ -23,4 +23,4 @@ end
execute "echo foo" do
notifies :create, resources("file[#{node[:tmpdir]}/notified_file.txt]"), :delayed
-end \ No newline at end of file
+end
diff --git a/features/data/cookbooks/deploy/recipes/callbacks.rb b/features/data/cookbooks/deploy/recipes/callbacks.rb
index 278b7c0e47..7d19c90446 100644
--- a/features/data/cookbooks/deploy/recipes/callbacks.rb
+++ b/features/data/cookbooks/deploy/recipes/callbacks.rb
@@ -75,4 +75,4 @@ deploy "#{node[:tmpdir]}/deploy" do
"deploy/before_symlink.rb" => "deploy/before_symlink.rb",
"deploy/before_restart.rb" => "deploy/before_restart.rb",
"deploy/after_restart.rb" => "deploy/after_restart.rb"
-end \ No newline at end of file
+end
diff --git a/features/data/cookbooks/deploy/recipes/embedded_recipe_callbacks.rb b/features/data/cookbooks/deploy/recipes/embedded_recipe_callbacks.rb
index 7697098637..56804eaf50 100644
--- a/features/data/cookbooks/deploy/recipes/embedded_recipe_callbacks.rb
+++ b/features/data/cookbooks/deploy/recipes/embedded_recipe_callbacks.rb
@@ -67,4 +67,4 @@ timestamped_deploy "#{node[:tmpdir]}/deploy" do
end
end
-end \ No newline at end of file
+end
diff --git a/features/data/cookbooks/integration_setup/attributes/integration.rb b/features/data/cookbooks/integration_setup/attributes/integration.rb
index 7ee3a25090..c9da6119dc 100644
--- a/features/data/cookbooks/integration_setup/attributes/integration.rb
+++ b/features/data/cookbooks/integration_setup/attributes/integration.rb
@@ -22,4 +22,4 @@ require 'tmpdir'
int(Mash.new)
int[:tmpdir] = File.join(Dir.tmpdir, "chef_integration")
-tmpdir int[:tmpdir] \ No newline at end of file
+tmpdir int[:tmpdir]
diff --git a/features/data/cookbooks/manage_files/recipes/create_a_file.rb b/features/data/cookbooks/manage_files/recipes/create_a_file.rb
index 5a327d64b3..ae64c9a583 100644
--- a/features/data/cookbooks/manage_files/recipes/create_a_file.rb
+++ b/features/data/cookbooks/manage_files/recipes/create_a_file.rb
@@ -19,4 +19,4 @@
file "#{node[:tmpdir]}/create_a_file.txt" do
action :create
-end \ No newline at end of file
+end
diff --git a/features/data/cookbooks/manage_files/recipes/delete_a_file.rb b/features/data/cookbooks/manage_files/recipes/delete_a_file.rb
index 5d3faf41cd..85c5fec84f 100644
--- a/features/data/cookbooks/manage_files/recipes/delete_a_file.rb
+++ b/features/data/cookbooks/manage_files/recipes/delete_a_file.rb
@@ -21,4 +21,4 @@ include_recipe 'manage_files::create_a_file'
file "#{node[:tmpdir]}/create_a_file.txt" do
action :delete
-end \ No newline at end of file
+end
diff --git a/features/data/cookbooks/manage_files/recipes/delete_a_file_that_does_not_already_exist.rb b/features/data/cookbooks/manage_files/recipes/delete_a_file_that_does_not_already_exist.rb
index f6c2e33147..5121bc67fa 100644
--- a/features/data/cookbooks/manage_files/recipes/delete_a_file_that_does_not_already_exist.rb
+++ b/features/data/cookbooks/manage_files/recipes/delete_a_file_that_does_not_already_exist.rb
@@ -19,4 +19,4 @@
file "#{node[:tmpdir]}/create_a_file.txt" do
action :delete
-end \ No newline at end of file
+end
diff --git a/features/data/cookbooks/manage_files/recipes/set_the_owner_of_a_created_file.rb b/features/data/cookbooks/manage_files/recipes/set_the_owner_of_a_created_file.rb
index 28a92550e3..f57c78650f 100644
--- a/features/data/cookbooks/manage_files/recipes/set_the_owner_of_a_created_file.rb
+++ b/features/data/cookbooks/manage_files/recipes/set_the_owner_of_a_created_file.rb
@@ -20,4 +20,4 @@
file "#{node[:tmpdir]}/create_a_file.txt" do
owner 'nobody'
action :create
-end \ No newline at end of file
+end
diff --git a/features/data/cookbooks/manage_files/recipes/touch_a_file.rb b/features/data/cookbooks/manage_files/recipes/touch_a_file.rb
index 3aff3fa6d6..86c971c9ac 100644
--- a/features/data/cookbooks/manage_files/recipes/touch_a_file.rb
+++ b/features/data/cookbooks/manage_files/recipes/touch_a_file.rb
@@ -19,4 +19,4 @@
file "#{node[:tmpdir]}/touch_test.txt" do
action :touch
-end \ No newline at end of file
+end
diff --git a/features/data/cookbooks/packages/recipes/gem_package.rb b/features/data/cookbooks/packages/recipes/gem_package.rb
index b17bff046e..b6bddffa8d 100644
--- a/features/data/cookbooks/packages/recipes/gem_package.rb
+++ b/features/data/cookbooks/packages/recipes/gem_package.rb
@@ -23,4 +23,4 @@ gem_package "chef-integration-test" do
source "http://localhost:8000"
version "0.1.0"
options "-i #{node[:tmpdir]}/installed-gems/"
-end \ No newline at end of file
+end
diff --git a/features/data/cookbooks/packages/recipes/install_gem_noshell.rb b/features/data/cookbooks/packages/recipes/install_gem_noshell.rb
index 8035d9f7e0..27a0c7d2a4 100644
--- a/features/data/cookbooks/packages/recipes/install_gem_noshell.rb
+++ b/features/data/cookbooks/packages/recipes/install_gem_noshell.rb
@@ -23,4 +23,4 @@ gem_package "chef-integration-test" do
source "http://localhost:8000"
version "0.1.0"
options :install_dir => "#{node[:tmpdir]}/installed-gems/"
-end \ No newline at end of file
+end
diff --git a/features/data/cookbooks/packages/recipes/manually_upgrade_gem_package.rb b/features/data/cookbooks/packages/recipes/manually_upgrade_gem_package.rb
index 4da61d6d22..db1de3fcbc 100644
--- a/features/data/cookbooks/packages/recipes/manually_upgrade_gem_package.rb
+++ b/features/data/cookbooks/packages/recipes/manually_upgrade_gem_package.rb
@@ -29,4 +29,4 @@ gem_package "chef-integration-test" do
source "http://localhost:8000"
options "-i #{node[:tmpdir]}/installed-gems/"
version "0.1.1"
-end \ No newline at end of file
+end
diff --git a/features/data/cookbooks/packages/recipes/upgrade_gem_noshell.rb b/features/data/cookbooks/packages/recipes/upgrade_gem_noshell.rb
index 9f678227e1..c009f38fcd 100644
--- a/features/data/cookbooks/packages/recipes/upgrade_gem_noshell.rb
+++ b/features/data/cookbooks/packages/recipes/upgrade_gem_noshell.rb
@@ -30,4 +30,4 @@ gem_package "chef-integration-test-upgrade" do
source "http://localhost:8000"
options :install_dir => "#{node[:tmpdir]}/installed-gems/"
action :upgrade
-end \ No newline at end of file
+end
diff --git a/features/data/cookbooks/packages/recipes/upgrade_gem_package.rb b/features/data/cookbooks/packages/recipes/upgrade_gem_package.rb
index 262e91c6af..636d8b771b 100644
--- a/features/data/cookbooks/packages/recipes/upgrade_gem_package.rb
+++ b/features/data/cookbooks/packages/recipes/upgrade_gem_package.rb
@@ -30,4 +30,4 @@ gem_package "chef-integration-test-upgrade" do
source "http://localhost:8000"
options "-i #{node[:tmpdir]}/installed-gems/"
action :upgrade
-end \ No newline at end of file
+end
diff --git a/features/data/cookbooks/transfer_remote_files/recipes/should_prefer_the_file_for_this_specific_host.rb b/features/data/cookbooks/transfer_remote_files/recipes/should_prefer_the_file_for_this_specific_host.rb
index 98415d1b15..a89ea4c9af 100644
--- a/features/data/cookbooks/transfer_remote_files/recipes/should_prefer_the_file_for_this_specific_host.rb
+++ b/features/data/cookbooks/transfer_remote_files/recipes/should_prefer_the_file_for_this_specific_host.rb
@@ -19,4 +19,4 @@
remote_file "#{node[:tmpdir]}/host_specific.txt" do
source "host_specific.txt"
-end \ No newline at end of file
+end
diff --git a/features/data/cookbooks/transfer_remote_files/recipes/transfer_a_file_from_a_cookbook.rb b/features/data/cookbooks/transfer_remote_files/recipes/transfer_a_file_from_a_cookbook.rb
index 70a650c803..ccc984e6d0 100644
--- a/features/data/cookbooks/transfer_remote_files/recipes/transfer_a_file_from_a_cookbook.rb
+++ b/features/data/cookbooks/transfer_remote_files/recipes/transfer_a_file_from_a_cookbook.rb
@@ -19,4 +19,4 @@
remote_file "#{node[:tmpdir]}/transfer_a_file_from_a_cookbook.txt" do
source "transfer_a_file_from_a_cookbook.txt"
-end \ No newline at end of file
+end
diff --git a/features/data/cookbooks_not_uploaded_at_feature_start/testcookbook_valid_v0.1.0_with_different_dependencies/metadata.rb b/features/data/cookbooks_not_uploaded_at_feature_start/testcookbook_valid_v0.1.0_with_different_dependencies/metadata.rb
index ca612b6a80..d3200e613c 100644
--- a/features/data/cookbooks_not_uploaded_at_feature_start/testcookbook_valid_v0.1.0_with_different_dependencies/metadata.rb
+++ b/features/data/cookbooks_not_uploaded_at_feature_start/testcookbook_valid_v0.1.0_with_different_dependencies/metadata.rb
@@ -4,4 +4,4 @@ license "Apache 2.0"
description "Description"
long_description "Long description"
version "0.1"
-depends "aws" \ No newline at end of file
+depends "aws"
diff --git a/features/data/cookbooks_not_uploaded_at_feature_start/version_test_0.1.0/metadata.rb b/features/data/cookbooks_not_uploaded_at_feature_start/version_test_0.1.0/metadata.rb
index 39bcd84875..4d461dd3cd 100644
--- a/features/data/cookbooks_not_uploaded_at_feature_start/version_test_0.1.0/metadata.rb
+++ b/features/data/cookbooks_not_uploaded_at_feature_start/version_test_0.1.0/metadata.rb
@@ -3,4 +3,4 @@ maintainer "Opscode"
maintainer_email "do_not_reply@opscode.com"
license "Apache 2.0"
description "Tests cookbook versioning in environments"
-version "0.1.0" \ No newline at end of file
+version "0.1.0"
diff --git a/features/data/cookbooks_not_uploaded_at_feature_start/version_test_0.1.1/metadata.rb b/features/data/cookbooks_not_uploaded_at_feature_start/version_test_0.1.1/metadata.rb
index a004e837f0..7ac700dcff 100644
--- a/features/data/cookbooks_not_uploaded_at_feature_start/version_test_0.1.1/metadata.rb
+++ b/features/data/cookbooks_not_uploaded_at_feature_start/version_test_0.1.1/metadata.rb
@@ -3,4 +3,4 @@ maintainer "Opscode"
maintainer_email "do_not_reply@opscode.com"
license "Apache 2.0"
description "Tests cookbook versioning in environments"
-version "0.1.1" \ No newline at end of file
+version "0.1.1"
diff --git a/features/data/cookbooks_not_uploaded_at_feature_start/version_test_0.10.0/metadata.rb b/features/data/cookbooks_not_uploaded_at_feature_start/version_test_0.10.0/metadata.rb
index 57e1b20e01..8ef67b86f1 100644
--- a/features/data/cookbooks_not_uploaded_at_feature_start/version_test_0.10.0/metadata.rb
+++ b/features/data/cookbooks_not_uploaded_at_feature_start/version_test_0.10.0/metadata.rb
@@ -3,4 +3,4 @@ maintainer "Opscode"
maintainer_email "do_not_reply@opscode.com"
license "Apache 2.0"
description "Tests cookbook versioning in environments"
-version "0.10.0" \ No newline at end of file
+version "0.10.0"
diff --git a/features/data/cookbooks_not_uploaded_at_feature_start/version_test_0.2.0/metadata.rb b/features/data/cookbooks_not_uploaded_at_feature_start/version_test_0.2.0/metadata.rb
index 4202c9ca9f..d0ecaaa746 100644
--- a/features/data/cookbooks_not_uploaded_at_feature_start/version_test_0.2.0/metadata.rb
+++ b/features/data/cookbooks_not_uploaded_at_feature_start/version_test_0.2.0/metadata.rb
@@ -3,4 +3,4 @@ maintainer "Opscode"
maintainer_email "do_not_reply@opscode.com"
license "Apache 2.0"
description "Tests cookbook versioning in environments"
-version "0.2.0" \ No newline at end of file
+version "0.2.0"
diff --git a/features/data/cookbooks_not_uploaded_at_feature_start/version_test_0.9.0/metadata.rb b/features/data/cookbooks_not_uploaded_at_feature_start/version_test_0.9.0/metadata.rb
index f926a138ff..f9af3f5faf 100644
--- a/features/data/cookbooks_not_uploaded_at_feature_start/version_test_0.9.0/metadata.rb
+++ b/features/data/cookbooks_not_uploaded_at_feature_start/version_test_0.9.0/metadata.rb
@@ -3,4 +3,4 @@ maintainer "Opscode"
maintainer_email "do_not_reply@opscode.com"
license "Apache 2.0"
description "Tests cookbook versioning in environments"
-version "0.9.0" \ No newline at end of file
+version "0.9.0"
diff --git a/features/data/cookbooks_not_uploaded_at_feature_start/version_test_0.9.7/metadata.rb b/features/data/cookbooks_not_uploaded_at_feature_start/version_test_0.9.7/metadata.rb
index d429e394cb..2594aff33c 100644
--- a/features/data/cookbooks_not_uploaded_at_feature_start/version_test_0.9.7/metadata.rb
+++ b/features/data/cookbooks_not_uploaded_at_feature_start/version_test_0.9.7/metadata.rb
@@ -3,4 +3,4 @@ maintainer "Opscode"
maintainer_email "do_not_reply@opscode.com"
license "Apache 2.0"
description "Tests cookbook versioning in environments"
-version "0.9.7" \ No newline at end of file
+version "0.9.7"
diff --git a/features/steps/cookbook_steps.rb b/features/steps/cookbook_steps.rb
index 695ee286a1..4c62d19162 100644
--- a/features/steps/cookbook_steps.rb
+++ b/features/steps/cookbook_steps.rb
@@ -390,4 +390,4 @@ Given "I upload multiple versions of the 'version_test' cookbook that do not lex
When "I fully upload a sandboxed cookbook force-named 'version_test' versioned '0.9.0' with 'version_test_0.9.0'"
When "I fully upload a sandboxed cookbook force-named 'version_test' versioned '0.10.0' with 'version_test_0.10.0'"
When "I fully upload a sandboxed cookbook force-named 'version_test' versioned '0.9.7' with 'version_test_0.9.7'"
-end \ No newline at end of file
+end
diff --git a/features/steps/packages.rb b/features/steps/packages.rb
index 2d349f0894..7eb2f3d21b 100644
--- a/features/steps/packages.rb
+++ b/features/steps/packages.rb
@@ -110,7 +110,6 @@ Then "the gem '$gem_name' version '$version' should not be installed" do |gem_na
Then "a file named 'installed-gems/gems/#{gem_name}-#{version}' should not exist"
end
-
def dpkg_should_be_installed(pkg_name)
shell_out!("dpkg -l #{pkg_name}")
end
@@ -118,4 +117,3 @@ end
Then "the dpkg package '$package_name' should be installed" do |package_name|
dpkg_should_be_installed(package_name)
end
-