Return-Path: X-Original-To: apmail-deltacloud-commits-archive@www.apache.org Delivered-To: apmail-deltacloud-commits-archive@www.apache.org Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by minotaur.apache.org (Postfix) with SMTP id 60DDA96B0 for ; Fri, 16 Dec 2011 13:44:57 +0000 (UTC) Received: (qmail 82084 invoked by uid 500); 16 Dec 2011 13:44:57 -0000 Delivered-To: apmail-deltacloud-commits-archive@deltacloud.apache.org Received: (qmail 82065 invoked by uid 500); 16 Dec 2011 13:44:57 -0000 Mailing-List: contact commits-help@deltacloud.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@deltacloud.apache.org Delivered-To: mailing list commits@deltacloud.apache.org Received: (qmail 82058 invoked by uid 99); 16 Dec 2011 13:44:56 -0000 Received: from nike.apache.org (HELO nike.apache.org) (192.87.106.230) by apache.org (qpsmtpd/0.29) with ESMTP; Fri, 16 Dec 2011 13:44:56 +0000 X-ASF-Spam-Status: No, hits=-2000.0 required=5.0 tests=ALL_TRUSTED X-Spam-Check-By: apache.org Received: from [140.211.11.4] (HELO eris.apache.org) (140.211.11.4) by apache.org (qpsmtpd/0.29) with ESMTP; Fri, 16 Dec 2011 13:44:54 +0000 Received: from eris.apache.org (localhost [127.0.0.1]) by eris.apache.org (Postfix) with ESMTP id 04ED42388A3F for ; Fri, 16 Dec 2011 13:44:33 +0000 (UTC) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r1215128 - /deltacloud/trunk/server/tests/common.rb Date: Fri, 16 Dec 2011 13:44:32 -0000 To: commits@deltacloud.apache.org From: mfojtik@apache.org X-Mailer: svnmailer-1.0.8-patched Message-Id: <20111216134433.04ED42388A3F@eris.apache.org> X-Virus-Checked: Checked by ClamAV on apache.org Author: mfojtik Date: Fri Dec 16 13:44:32 2011 New Revision: 1215128 URL: http://svn.apache.org/viewvc?rev=1215128&view=rev Log: Core: Updated rspec to rspec-core in our test suite Modified: deltacloud/trunk/server/tests/common.rb Modified: deltacloud/trunk/server/tests/common.rb URL: http://svn.apache.org/viewvc/deltacloud/trunk/server/tests/common.rb?rev=1215128&r1=1215127&r2=1215128&view=diff ============================================================================== --- deltacloud/trunk/server/tests/common.rb (original) +++ deltacloud/trunk/server/tests/common.rb Fri Dec 16 13:44:32 2011 @@ -20,8 +20,9 @@ $top_srcdir = File::dirname(File::dirnam require 'rubygems' require 'yaml' +require 'rspec/core' +require 'rspec/matchers' require 'test/unit' -require 'spec' require 'nokogiri' require 'json' require 'digest/sha1' @@ -43,8 +44,9 @@ configure :test do set :show_exceptions, false end -Spec::Runner.configure do |conf| +RSpec.configure do |conf| conf.include Rack::Test::Methods + conf.expect_with :rspec end module DeltacloudTestCommon