tddium-preview 0.6.16 → 0.6.18

data/.gitignore

@@ -21,6 +21,8 @@ nbproject
 .rvmrc
 .tddium
 .tddium.development
+.tddium-deploy-key
+.tddium-deploy-key.*
 .DS_Store
 
 # Have editor/IDE/OS specific files you need to ignore? Consider using a global gitignore: 

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    tddium-preview (0.6.15)
+    tddium-preview (0.6.18)
       bundler
       highline
       json

data/Rakefile

@@ -1,4 +1,5 @@
 # Copyright (c) 2011 Solano Labs All Rights Reserved
+#
 
 require 'bundler'
 Bundler::GemHelper.install_tasks
@@ -11,7 +12,7 @@ end
 task :default => :spec
 
 namespace :spec do
-  RUBY_VERSIONS = ["1.9.2-p180", "1.8.7-p302"]
+  RUBY_VERSIONS = ["1.9.2-p180", "1.8.7-p334"]
   GEMSET = "tddium"
   desc "Runs the specs across Ruby 1.8.7 and 1.9.2"
   task :xruby do

data/lib/tddium.rb

@@ -8,7 +8,7 @@ require "highline/import"
 require "json"
 require "tddium_client"
 require "base64"
-require 'erb'
+require "erb"
 require File.expand_path("../tddium/constant", __FILE__)
 require File.expand_path("../tddium/version", __FILE__)
 require File.expand_path("../tddium/heroku", __FILE__)
@@ -107,6 +107,7 @@ class Tddium < Thor
   end
 
   desc "password", "Change password"
+  map "passwd" => :password
   method_option :environment, :type => :string, :default => nil
   def password
     set_default_environment(options[:environment])
@@ -157,8 +158,14 @@ class Tddium < Thor
   method_option :user_data_file, :type => :string, :default => nil
   method_option :max_parallelism, :type => :numeric, :default => nil
   method_option :test_pattern, :type => :string, :default => nil
+  method_option :force, :type => :boolean, :default => false
   def spec
     set_default_environment(options[:environment])
+    git_version_ok
+    if git_changes then
+      exit_failure(Text::Error::GIT_CHANGES_NOT_COMMITTED) if !options[:force]
+      warn(Text::Warning::GIT_CHANGES_NOT_COMMITTED)
+    end
     exit_failure unless git_repo? && tddium_settings && suite_for_current_branch?
 
     test_execution_params = {}
@@ -247,7 +254,8 @@ class Tddium < Thor
       say "#{finished_tests.size} tests, #{test_statuses["failed"]} failures, #{test_statuses["error"]} errors, #{test_statuses["pending"]} pending"
 
       # Save the spec options
-      write_suite(current_suite_id, {"user_data_file" => user_data_file_path,
+      write_suite(suite_details["suite"].merge({"id" => current_suite_id}),
+                                    {"user_data_file" => user_data_file_path,
                                      "max_parallelism" => max_parallelism,
                                      "test_pattern" => test_pattern})
 
@@ -263,6 +271,7 @@ class Tddium < Thor
   method_option :environment, :type => :string, :default => nil
   def status
     set_default_environment(options[:environment])
+    git_version_ok
     return unless git_repo? && tddium_settings && suite_for_current_branch?
 
     begin
@@ -292,6 +301,7 @@ class Tddium < Thor
   end
 
   desc "suite", "Register the suite for this project, or edit its settings"
+  method_option :edit, :type => :boolean, :default => false
   method_option :name, :type => :string, :default => nil
   method_option :pull_url, :type => :string, :default => nil
   method_option :push_url, :type => :string, :default => nil
@@ -299,6 +309,7 @@ class Tddium < Thor
   method_option :environment, :type => :string, :default => nil
   def suite
     set_default_environment(options[:environment])
+    git_version_ok
     return unless git_repo? && tddium_settings
 
     params = {}
@@ -306,8 +317,11 @@ class Tddium < Thor
       if current_suite_id
         current_suite = call_api(:get, current_suite_path)["suite"]
 
-        say Text::Process::EXISTING_SUITE % format_suite_details(current_suite)
-        prompt_update_suite(current_suite, options)
+        if options[:edit]
+          update_suite(current_suite, options)
+        else
+          say Text::Process::EXISTING_SUITE % format_suite_details(current_suite)
+        end
       else
         params[:branch] = current_git_branch
         default_suite_name = File.basename(Dir.pwd)
@@ -317,7 +331,7 @@ class Tddium < Thor
 
         if use_existing_suite
           # Write to file and exit when using the existing suite
-          write_suite(existing_suite["id"])
+          write_suite(existing_suite)
           say Text::Status::USING_SUITE % format_suite_details(existing_suite)
           return
         end
@@ -332,7 +346,7 @@ class Tddium < Thor
         say Text::Process::CREATING_SUITE % [params[:repo_name], params[:branch]]
         new_suite = call_api(:post, Api::Path::SUITES, {:suite => params})
         # Save the created suite
-        write_suite(new_suite["suite"]["id"])
+        write_suite(new_suite["suite"])
 
         # Manage git
         exit_failure("Failed to push repo to Tddium!") unless update_git_remote_and_push(new_suite)
@@ -363,6 +377,45 @@ class Tddium < Thor
     result
   end
 
+  def git_changes
+    cmd = "(git ls-files --exclude-standard -d -m -t || echo GIT_FAILED) < /dev/null 2>&1"
+    p = IO.popen(cmd)
+    changes = false
+    while line = p.gets do
+      if line =~ /GIT_FAILED/
+        warn(Text::Warning::GIT_UNABLE_TO_DETECT)
+        return false
+      end
+      line = line.strip
+      fields = line.split(/\s+/)
+      status = fields[0]
+      if status !~ /^\?/ then
+        changes = true
+        break
+      end
+    end
+    return changes
+  end
+
+  def git_version_ok
+    version = nil
+    begin
+      version_string = `git --version`
+      m =  version_string.match(Dependency::VERSION_REGEXP)
+      version = m[0] unless m.nil?
+    rescue Errno
+    rescue Exception
+    end
+    if version.nil? || version.empty? then
+      exit_failure(Text::Error::GIT_NOT_FOUND)
+    end
+    version_parts = version.split(".")
+    if version_parts[0].to_i < 1 ||
+       version_parts[1].to_i < 7 then
+      warn(Text::Warning::GIT_VERSION % version)
+    end
+  end
+
   def current_git_branch
     @current_git_branch ||= File.basename(`git symbolic-ref HEAD`.gsub("\n", ""))
   end
@@ -546,13 +599,11 @@ class Tddium < Thor
     ask_or_update.call(:campfire_room, Text::Prompt::CAMPFIRE_ROOM, nil)
   end
 
-  def prompt_update_suite(suite, options)
-    if prompt(Text::Prompt::UPDATE_SUITE, nil, 'n') == Text::Prompt::Response::YES
-      params = {}
-      prompt_suite_params(options, params, suite)
-      call_api(:put, "#{Api::Path::SUITES}/#{suite['id']}", params)
-      say Text::Process::UPDATED_SUITE
-    end
+  def update_suite(suite, options)
+    params = {}
+    prompt_suite_params(options, params, suite)
+    call_api(:put, "#{Api::Path::SUITES}/#{suite['id']}", params)
+    say Text::Process::UPDATED_SUITE
   end
 
   def resolve_suite_name(options, params, default_suite_name)
@@ -630,6 +681,11 @@ class Tddium < Thor
     details
   end
 
+  def tddium_deploy_key_file_name
+    extension = ".#{environment}" unless environment == :production
+    ".tddium-deploy-key#{extension}"
+  end
+
   def suite_for_current_branch?
     unless current_suite_id
       message = Text::Error::NO_SUITE_EXISTS % current_git_branch
@@ -685,20 +741,26 @@ class Tddium < Thor
     write_tddium_to_gitignore
   end
 
-  def write_suite(suite_id, options = {})
+  def write_suite(suite, options = {})
+    suite_id = suite["id"]
     branches = tddium_settings["branches"] || {}
     branches.merge!({current_git_branch => {"id" => suite_id, "options" => options}})
     File.open(tddium_file_name, "w") do |file|
       file.write(tddium_settings.merge({"branches" => branches}).to_json)
     end
+    File.open(tddium_deploy_key_file_name, "w") do |file|
+      file.write(suite["ci_ssh_pubkey"])
+    end
     write_tddium_to_gitignore
   end
 
   def write_tddium_to_gitignore
     content = File.exists?(Git::GITIGNORE) ? File.read(Git::GITIGNORE) : ''
-    unless content.include?("#{tddium_file_name}\n")
-      File.open(Git::GITIGNORE, "a") do |file|
-        file.write("#{tddium_file_name}\n")
+    [tddium_file_name, tddium_deploy_key_file_name].each do |fn|
+      unless content.include?("#{fn}\n")
+        File.open(Git::GITIGNORE, "a") do |file|
+          file.write("#{fn}\n")
+        end
       end
     end
   end

data/lib/tddium/constant.rb

@@ -59,7 +59,6 @@ module TddiumConstant
       INVITATION_TOKEN = "Enter your invitation token:"
       USE_EXISTING_SUITE = "A suite exists '%%s' (branch %s). Enter '#{Response::YES}' to use it, or enter a new repo name:"
       TEST_PATTERN = "Enter a test pattern or press 'Return'. Using '%s' by default:"
-      UPDATE_SUITE = "Do you want to edit settings for this suite? (y/n)"
       CI_PULL_URL = "Enter git URL to pull from (default '%s'):"
       CI_PUSH_URL = "Enter git URL to push to (default '%s'):"
       CAMPFIRE_SUBDOMAIN = "Enter your Campfire subdomain (default '%s'):"
@@ -68,7 +67,9 @@ module TddiumConstant
     end
 
     module Warning
-      GIT_CHANGES_NOT_COMMITTED = "Uncommitted changes in local git repository"
+      GIT_VERSION = "Unsupported git version: %s"
+      GIT_CHANGES_NOT_COMMITTED = "There are uncommitted changes in the local git repository"
+      GIT_UNABLE_TO_DETECT = "Unable to detect uncommitted git changes"
     end
 
     module Process
@@ -222,19 +223,54 @@ Notifications:
 Authorize the following SSH key to let Tddium's pulls and pushes through:
 
 <%=suite["ci_ssh_pubkey"]%>
+<% if suite["ci_pull_url"] =~ /^git@github.com:(.*).git$/ %>
+Tddium will pull from your Github repository. Visit
+https://github.com/<%= $1 %>/admin/keys
+then click "Add another deploy key" and copy and paste the above key.
+<% end %>
+<% if suite["ci_push_url"] =~ /^git@heroku.com:(.*).git$/ %>
+Tddium will push to your Heroku application <%= $1 %>.
+To authorize the key, use the following command:
+heroku keys:add <%= tddium_deploy_key_file_name %> --app <%= $1 %>
+<% end %>
 
-To trigger CI builds, POST to the following URL from a post-commit hook:
-
+<% if suite["ci_pull_url"] =~ /^git@github.com:(.*).git$/ %>
+Github can notify Tddium of your commits with a post-receive hook. Visit
+https://github.com/<%= $1 %>/admin/hooks#generic_minibucket
+then add the following URL and click "Update Settings":
 <%=suite["hook_uri"]%>
+<% else %>
+It looks like you aren't using Github, so you'll need to manually configure
+your post-commit hook. In Unix-based Git repositories, find the repository
+root and look for a shell script in `.git/hooks/post-commit`.
+To trigger CI builds, POST to the following URL from a post-commit hook:
+<% end %>
 
-See www.tddium.com/support for more information.
+See http://www.tddium.com/support for more information on Tddium CI.
 <% end %>
+
+If your tests don't require a database, you're all set and can now run
+tddium spec.
+
+If your tests do use a database, you'll now need to configure your 
+database setup. See http://www.tddium.com/support/reference#setup_hooks 
+to create a Rake task for Tddium to set up your database.
+
+Run 'tddium suite --edit' to edit suite settings.
 EOF
     end
 
     module Error
+      GIT_CHANGES_NOT_COMMITTED =<<EOF
+There are uncommitted changes in the local git repository.
+
+Commit changes before running 'tddium spec'.
+
+Use 'tddium spec --force' to test with only already-committed changes.
+EOF
       NOT_INITIALIZED = "tddium must be initialized. Try 'tddium login'"
       INVALID_TDDIUM_FILE = ".tddium.%s config file is corrupt. Try 'tddium login'"
+      GIT_NOT_FOUND = "Tddium requires git and git is not on your PATH"
       GIT_NOT_INITIALIZED =<<EOF;
 It doesn't look like you're in a git repo.  If you're not, use 'git init' to
 create one.
@@ -265,7 +301,15 @@ http://blog.tddium.com/home/
       HEROKU_MISCONFIGURED = "There was an error linking your Heroku account to Tddium: %s"
       module Heroku
         NOT_FOUND = "heroku command not found.  Make sure the latest heroku gem is installed.\nOutput of `gem list heroku`:\n%s"
-        NOT_ADDED = "It looks like you haven't enabled the tddium addon.  Add it using 'heroku addons:add tddium'"
+        NOT_ADDED =<<EOF;
+It looks like you haven't enabled the tddium add-on for the default app.
+Add it using 'heroku addons:add tddium'
+
+If you've already enabled the addon for a specific app, try running:
+
+   $ tddium heroku --app <your app name>'
+
+EOF
         INVALID_FORMAT = "The 'heroku -s' command output a format we didn't recognize.  Make sure you're running the latest version of the heroku gem"
         NOT_LOGGED_IN = "Log in to your heroku account first using 'heroku login'"
         APP_NOT_FOUND = "The app '%s' is not recognized by Heroku"

data/lib/tddium/version.rb

@@ -3,5 +3,5 @@ Copyright (c) 2011 Solano Labs All Rights Reserved
 =end
 
 module TddiumVersion
-  VERSION = "0.6.16"
+  VERSION = "0.6.18"
 end

data/spec/spec_helper.rb

@@ -9,6 +9,7 @@ require 'rspec'
 require "fakefs/spec_helpers"
 require "tddium_client/tddium_spec_helpers"
 
+require "stringio"
 require 'ostruct'
 
 class Open3SpecHelper

data/spec/tddium_spec.rb

@@ -35,6 +35,7 @@ describe Tddium do
   DEFAULT_TEST_PATTERN = "**/*_spec.rb"
   SAMPLE_SUITE_PATTERN = "features/*.feature, spec/**/*_spec.rb"
   CUSTOM_TEST_PATTERN = "**/cat_spec.rb"
+  SAMPLE_SSH_PUBKEY = "ssh-rsa 1234567890"
   SAMPLE_SUITE_RESPONSE = {"repo_name" => SAMPLE_APP_NAME,
                            "branch" => SAMPLE_BRANCH_NAME, 
                            "id" => SAMPLE_SUITE_ID, 
@@ -42,10 +43,11 @@ describe Tddium do
                            "rubygems_version"=>SAMPLE_RUBYGEMS_VERSION,
                            "bundler_version"=>SAMPLE_BUNDLER_VERSION,
                            "git_repo_uri" => SAMPLE_GIT_REPO_URI,
+                           "ci_ssh_pubkey" => SAMPLE_SSH_PUBKEY,
                            "test_pattern" => SAMPLE_SUITE_PATTERN}
   SAMPLE_SUITES_RESPONSE = {"suites" => [SAMPLE_SUITE_RESPONSE]}
-  SAMPLE_SUITE_OUTPUT = "Repo: #{SAMPLE_APP_NAME}/#{SAMPLE_BRANCH_NAME}\nDefault Test Pattern: #{SAMPLE_SUITE_PATTERN}\nRuby Version: #{SAMPLE_RUBY_VERSION}\nRubygems Version: #{SAMPLE_RUBYGEMS_VERSION}\nBundler Version: #{SAMPLE_BUNDLER_VERSION}\n\n"
   SAMPLE_TDDIUM_CONFIG_FILE = ".tddium.test"
+  SAMPLE_TDDIUM_DEPLOY_KEY_FILE = ".tddium-deploy-key.test"
   SAMPLE_TEST_EXECUTION_STATS = "total 1, notstarted 0, started 1, passed 0, failed 0, pending 0, error 0", "start_time"
   SAMPLE_USER_RESPONSE = {"status"=>0, "user"=>
     { "id"=>SAMPLE_USER_ID, 
@@ -53,7 +55,6 @@ describe Tddium do
       "email" => SAMPLE_EMAIL, 
       "created_at" => SAMPLE_DATE_TIME, 
       "recurly_url" => SAMPLE_RECURLY_URL}}
-  SAMPLE_SSH_PUBKEY = "ssh-rsa 1234567890"
   SAMPLE_HEROKU_USER_RESPONSE = {"user"=>
     { "id"=>SAMPLE_USER_ID, 
       "api_key" => SAMPLE_API_KEY, 
@@ -178,6 +179,8 @@ describe Tddium do
     stub_tddium_client
     stub_git_status(tddium)
     stub_git_config(tddium)
+    stub_git_changes(tddium)
+    stub_git_version_ok(tddium)
     create_file(File.join(".git", "something"), "something")
     create_file(Tddium::Git::GITIGNORE, "something")
   end
@@ -190,6 +193,14 @@ describe Tddium do
     tddium.stub(:system).with(/git status/).and_return(result)
   end
 
+  def stub_git_changes(tddium, result=false)
+    tddium.stub(:git_changes).and_return(result)
+  end
+
+  def stub_git_version_ok(tddium, result=false)
+    tddium.stub(:git_version_ok).and_return(result)
+  end
+
   def stub_git_config(tddium)
     tddium.stub(:`).with("git config --get remote.origin.url").and_return(SAMPLE_GIT_REPO_URI)
   end
@@ -230,6 +241,61 @@ describe Tddium do
   let(:tddium) { Tddium.new }
   let(:tddium_client) { mock(TddiumClient).as_null_object }
 
+  describe "problems running git" do
+    before(:each) do
+    end
+
+    it "should fail and exit if git is not found" do
+      tddium.stub(:`).with('git --version').and_raise(Errno::ENOENT)
+      tddium.should_receive(:exit_failure).with(Tddium::Text::Error::GIT_NOT_FOUND).and_raise("exit")
+      lambda { tddium.send(:git_version_ok) }.should raise_error("exit")
+    end
+
+    it "should warn if git version is unsupported" do
+      tddium.stub(:`).with('git --version').and_return("git version 1.6.2")
+      tddium.should_receive(:warn).with(Tddium::Text::Warning::GIT_VERSION % "1.6.2").and_return(nil)
+      tddium.send(:git_version_ok)
+    end
+
+    it "should warn if git version is unsupported" do
+      tddium.stub(:`).with('git --version').and_return("git version 1.7.5")
+      tddium.should_not_receive(:exit_failure)
+      tddium.should_not_receive(:warn)
+      tddium.send(:git_version_ok)
+    end
+  end
+
+  describe "changes in git" do
+    before(:each) do
+      @none = ''
+      @modified = "C lib/tddium.rb\n R spec/spec_helper.rb\n"
+      @unknown = " ? spec/bogus_spec.rb\n"
+      stub_config_file(:api_key => true, :branches => true)
+    end
+
+    it "should handle failure" do
+      ::IO.stub(:popen) { StringIO.new("GIT_FAILED") }
+      tddium.should_receive(:warn).with(Tddium::Text::Warning::GIT_UNABLE_TO_DETECT).and_return(nil)
+      tddium.send(:git_changes).should be_false
+    end
+
+    it "should signal no changes if there are none" do
+      ::IO.stub(:popen) { StringIO.new(@none) }
+      tddium.send(:git_changes).should be_false
+    end
+
+    it "should ignore unknown files if there are any" do
+      ::IO.stub(:popen) { StringIO.new(@unknown) }
+      tddium.send(:git_changes).should be_false
+    end
+
+    it "should signal uncommitted changes" do
+      status = @unknown + @modified
+      ::IO.stub(:popen) { StringIO.new(status) }
+      tddium.send(:git_changes).should be_true
+    end
+  end
+
   shared_examples_for "a password prompt" do
     context "--password was not passed in" do
       it "should prompt for a password or confirmation" do
@@ -1041,6 +1107,13 @@ describe Tddium do
               end
             end
 
+            shared_examples_for("saving spec options") do
+              it "should save the spec options" do
+                tddium.should_receive(:write_suite).with(SAMPLE_SUITE_RESPONSE, {"user_data_file" => nil, "max_parallelism" => 3, "test_pattern" => nil})
+                run_spec(tddium, {:max_parallelism => 3})
+              end
+            end
+
             context "user presses 'Ctrl-C' during the process" do
               before do
                 stub_call_api_response(:get, "#{Tddium::Api::Path::SESSIONS}/#{SAMPLE_SESSION_ID}/#{Tddium::Api::Path::TEST_EXECUTIONS}", get_test_executions_response)
@@ -1106,11 +1179,7 @@ describe Tddium do
                   end
                 end
 
-                it "should save the spec options" do
-                  tddium.should_receive(:write_suite).with(SAMPLE_SUITE_ID, {"user_data_file" => nil, "max_parallelism" => 3, "test_pattern" => nil})
-                  run_spec(tddium, {:max_parallelism => 3})
-                end
-
+                it_behaves_like "saving spec options"
                 it_should_behave_like("test output summary")
               end
 
@@ -1167,11 +1236,7 @@ describe Tddium do
                   end
                 end
 
-                it "should save the spec options" do
-                  tddium.should_receive(:write_suite).with(SAMPLE_SUITE_ID, {"user_data_file" => nil, "max_parallelism" => 3, "test_pattern" => nil})
-                  run_spec(tddium, {:max_parallelism => 3})
-                end
-
+                it_should_behave_like "saving spec options"
                 it_should_behave_like("test output summary")
               end
             end
@@ -1339,18 +1404,18 @@ describe Tddium do
       tddium.stub(:ask).and_return("")
     end
 
-    shared_examples_for "prompting for suite configuration" do
+    shared_examples_for "prompting for suite configuration" do |options|
       it "should prompt for URLs" do
         tddium.should_receive(:ask).with(Tddium::Text::Prompt::CI_PULL_URL % current.fetch('ci_pull_url', SAMPLE_GIT_REPO_URI), anything)
         tddium.should_receive(:ask).with(Tddium::Text::Prompt::CI_PUSH_URL % current['ci_push_url'], anything)
-        run_suite(tddium)
+        run_suite(tddium, options)
       end
 
       it "should prompt for campfire" do
         tddium.should_receive(:ask).with(Tddium::Text::Prompt::CAMPFIRE_SUBDOMAIN % current['campfire_subdomain'], anything)
         tddium.should_receive(:ask).with(Tddium::Text::Prompt::CAMPFIRE_TOKEN % current['campfire_token'], anything)
         tddium.should_receive(:ask).with(Tddium::Text::Prompt::CAMPFIRE_ROOM % current['campfire_room'], anything)
-        run_suite(tddium)
+        run_suite(tddium, options)
       end
     end
 
@@ -1420,6 +1485,12 @@ describe Tddium do
             JSON.parse(tddium_file)["branches"][SAMPLE_BRANCH_NAME]["id"].should == SAMPLE_SUITE_ID
           end
 
+          it "should write the deploy key file" do
+            run_suite(tddium)
+            deploy_key_data = File.open(SAMPLE_TDDIUM_DEPLOY_KEY_FILE) { |file| file.read }
+            deploy_key_data.should == SAMPLE_SSH_PUBKEY
+          end
+
           it "should update the gitignore file with tddium" do
             run_suite(tddium)
             gitignore_file = File.open(Tddium::Git::GITIGNORE) { |file| file.read }
@@ -1473,8 +1544,8 @@ describe Tddium do
 
           it_should_behave_like "writing the suite to file"
 
-          it "should show the user: '#{Tddium::Text::Status::USING_SUITE % SAMPLE_SUITE_OUTPUT}'" do
-            tddium.should_receive(:say).with(Tddium::Text::Status::USING_SUITE % SAMPLE_SUITE_OUTPUT)
+          it "should show the user: sample suite output" do
+            tddium.should_receive(:say).with(Tddium::Text::Status::USING_SUITE % tddium.send(:format_suite_details, SAMPLE_SUITE_RESPONSE))
             run_suite(tddium)
           end
         end
@@ -1570,25 +1641,17 @@ describe Tddium do
         end
 
         it "should display '#{Tddium::Text::Process::EXISTING_SUITE}'" do
-          tddium.should_receive(:say).with(Tddium::Text::Process::EXISTING_SUITE % SAMPLE_SUITE_OUTPUT)
-          run_suite(tddium)
-        end
-
-        it "should check if the user wants to update the suite" do
-          tddium.should_receive(:ask).with(Tddium::Text::Prompt::UPDATE_SUITE, anything)
+          tddium.should_receive(:say).with(Tddium::Text::Process::EXISTING_SUITE % tddium.send(:format_suite_details, SAMPLE_SUITE_RESPONSE))
           run_suite(tddium)
         end
 
         context "user wants to update the suite" do
-          before(:each) do
-            tddium.stub(:ask).with(Tddium::Text::Prompt::UPDATE_SUITE, anything).and_return(Tddium::Text::Prompt::Response::YES)
-          end
-          it_behaves_like "prompting for suite configuration" do
+          it_behaves_like "prompting for suite configuration", {:edit=>true} do
             let(:current) { SAMPLE_SUITE_RESPONSE }
           end
           it "should PUT to /suites/#{SAMPLE_SUITE_ID}" do
             call_api_should_receive(:method=>:put, :path=>"#{Tddium::Api::Path::SUITES}/#{SAMPLE_SUITE_ID}")
-            run_suite(tddium)
+            run_suite(tddium, {:edit=>true})
           end
         end
 

metadata

@@ -2,7 +2,7 @@
 name: tddium-preview
 version: !ruby/object:Gem::Version 
   prerelease: 
-  version: 0.6.16
+  version: 0.6.18
 platform: ruby
 authors: 
 - Solano Labs
@@ -10,7 +10,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-06-28 00:00:00 -07:00
+date: 2011-06-30 00:00:00 -07:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency