From 90134e06c917949765eb077701d3f815f38fdb4d Mon Sep 17 00:00:00 2001
From: "R. Tyler Croy" <tyler@monkeypox.org>
Date: Tue, 31 Jul 2012 16:54:23 -0700
Subject: [PATCH] Refactor step definitions into much more logical files

---
 features/step_definitions/general_steps.rb    |  8 +++
 .../job_configuration_steps.rb                | 43 ++++++++++++
 .../{freestyle_steps.rb => job_steps.rb}      | 65 ++-----------------
 3 files changed, 58 insertions(+), 58 deletions(-)
 create mode 100644 features/step_definitions/job_configuration_steps.rb
 rename features/step_definitions/{freestyle_steps.rb => job_steps.rb} (54%)

diff --git a/features/step_definitions/general_steps.rb b/features/step_definitions/general_steps.rb
index e736030..ef3a24c 100644
--- a/features/step_definitions/general_steps.rb
+++ b/features/step_definitions/general_steps.rb
@@ -1,6 +1,14 @@
 #!/usr/bin/env ruby
 # vim: tabstop=2 expandtab shiftwidth=2
+When /^I visit the home page$/ do
+  visit "/"
+end
+
+When /^I click the "([^"]*)" checkbox$/ do |name|
+  find(:xpath, "//input[@name='#{name}']").set(true)
+end
 
 Then /^the page should say "([^"]*)"$/ do |content|
   page.should have_content(content)
 end
+
diff --git a/features/step_definitions/job_configuration_steps.rb b/features/step_definitions/job_configuration_steps.rb
new file mode 100644
index 0000000..aedc659
--- /dev/null
+++ b/features/step_definitions/job_configuration_steps.rb
@@ -0,0 +1,43 @@
+
+When /^I configure the job$/ do
+  @job.configure
+end
+
+When /^I add a script build step to run "([^"]*)"$/ do |script|
+  @job.add_script_step(script)
+end
+
+When /^I tie the job to the "([^"]*)" label$/ do |label|
+  @job.configure do
+    @job.label_expression = label
+  end
+end
+
+When /^I tie the job to the slave$/ do
+  step %{I tie the job to the "#{@slave.name}" label}
+end
+
+When /^I enable concurrent builds$/ do
+  step %{I click the "_.concurrentBuild" checkbox}
+end
+
+When /^I add a string parameter "(.*?)"$/ do |string_param|
+  @job.configure do
+    @job.add_parameter("String Parameter",string_param,string_param)
+  end
+end
+When /^I add an Ant build step for:$/ do |ant_xml|
+  @job.configure do
+    @job.add_script_step("cat > build.xml <<EOF
+  #{ant_xml}
+EOF")
+    @job.add_ant_step('hello', 'build.xml')
+  end
+end
+
+When /^I disable the job$/ do
+  @job.configure do
+    @job.disable
+  end
+end
+
diff --git a/features/step_definitions/freestyle_steps.rb b/features/step_definitions/job_steps.rb
similarity index 54%
rename from features/step_definitions/freestyle_steps.rb
rename to features/step_definitions/job_steps.rb
index e3979ca..0be2fb8 100644
--- a/features/step_definitions/freestyle_steps.rb
+++ b/features/step_definitions/job_steps.rb
@@ -2,42 +2,26 @@
 # vim: tabstop=2 expandtab shiftwidth=2
 
 
+Given /^a simple job$/ do
+  @job = Jenkins::Job.create_freestyle(@base_url, Jenkins::Job.random_name)
+  @job.configure do
+    @job.add_script_step("ls")
+  end
+end
+
 Given /^a job$/ do
   @job = Jenkins::Job.create_freestyle(@base_url, Jenkins::Job.random_name)
 end
 
 
-############################################################################
-
-
-When /^I configure the job$/ do
-  @job.configure
-end
-
-When /^I visit the home page$/ do
-  visit "/"
-end
-
 When /^I create a job named "([^"]*)"$/ do |name|
   @job = Jenkins::Job.create_freestyle(@base_url, name)
 end
 
-When /^I add a script build step to run "([^"]*)"$/ do |script|
-  @job.add_script_step(script)
-end
-
 When /^I run the job$/ do
   @job.queue_build
 end
 
-When /^I click the "([^"]*)" checkbox$/ do |name|
-  find(:xpath, "//input[@name='#{name}']").set(true)
-end
-
-When /^I enable concurrent builds$/ do
-  step %{I click the "_.concurrentBuild" checkbox}
-end
-
 When /^I save the job$/ do
   @job.save
 end
@@ -46,16 +30,6 @@ When /^I visit the job page$/ do
   @job.open
 end
 
-When /^I tie the job to the "([^"]*)" label$/ do |label|
-  @job.configure do
-    @job.label_expression = label
-  end
-end
-
-When /^I tie the job to the slave$/ do
-  step %{I tie the job to the "#{@slave.name}" label}
-end
-
 When /^I build (\d+) jobs$/  do |count|
   count.to_i.times do |i|
     @job.queue_build
@@ -63,16 +37,6 @@ When /^I build (\d+) jobs$/  do |count|
   sleep 6 # Hard-coded sleep to allow the queue delay in Jenkins to expire
 end
 
-When /^I add a string parameter "(.*?)"$/ do |string_param|
-  @job.configure do
-    @job.add_parameter("String Parameter",string_param,string_param)
-  end
-end
-
-
-############################################################################
-
-
 Then /^I should see console output matching "([^"]*)"$/ do |script|
   @job.last_build.console.should match /#{Regexp.escape(script)}/
 end
@@ -89,25 +53,10 @@ Then /^I should be prompted to enter the "(.*?)" parameter$/ do |param_name|
   find(:xpath, "//input[@value='#{param_name}']").instance_of?(Capybara::Node::Element).should be true
 end
 
-When /^I add an Ant build step for:$/ do |ant_xml|
-  @job.configure do
-    @job.add_script_step("cat > build.xml <<EOF
-  #{ant_xml}
-EOF")
-    @job.add_ant_step('hello', 'build.xml')
-  end
-end
-
 Then /^the build should succeed$/ do
   @job.last_build.succeeded?.should be true
 end
 
-When /^I disable the job$/ do
-  @job.configure do
-    @job.disable
-  end
-end
-
 Then /^it should be disabled$/ do
   page.should_not have_content 'Build Now'
 end