deltacloud-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From mfoj...@apache.org
Subject git commit: Removed gemfile location from travis.yml
Date Tue, 26 Mar 2013 18:14:20 GMT
Updated Branches:
  refs/heads/master ac319b341 -> fd262d706


Removed gemfile location from travis.yml


Project: http://git-wip-us.apache.org/repos/asf/deltacloud/repo
Commit: http://git-wip-us.apache.org/repos/asf/deltacloud/commit/fd262d70
Tree: http://git-wip-us.apache.org/repos/asf/deltacloud/tree/fd262d70
Diff: http://git-wip-us.apache.org/repos/asf/deltacloud/diff/fd262d70

Branch: refs/heads/master
Commit: fd262d706dee814bd27d5047fe62c8a056903e4e
Parents: ac319b3
Author: Michal Fojtik <mfojtik@redhat.com>
Authored: Tue Mar 26 19:13:57 2013 +0100
Committer: Michal fojtik <mfojtik@redhat.com>
Committed: Tue Mar 26 19:13:57 2013 +0100

----------------------------------------------------------------------
 .travis.yml                 |    1 -
 client/Gemfile              |    1 +
 client/tests/test_helper.rb |    6 +++---
 3 files changed, 4 insertions(+), 4 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/deltacloud/blob/fd262d70/.travis.yml
----------------------------------------------------------------------
diff --git a/.travis.yml b/.travis.yml
index 9d1d2ce..82c98e8 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -5,7 +5,6 @@ rvm:
   - jruby-head
 jdk:
   - openjdk7
-gemfile: server/Gemfile
 install:
   - cd server
   - bundle install

http://git-wip-us.apache.org/repos/asf/deltacloud/blob/fd262d70/client/Gemfile
----------------------------------------------------------------------
diff --git a/client/Gemfile b/client/Gemfile
index 4c6d274..1b6f0d0 100644
--- a/client/Gemfile
+++ b/client/Gemfile
@@ -8,5 +8,6 @@ group :development do
   gem 'minitest'
   gem 'vcr'
   gem 'pry'
+  gem 'turn'
   gem 'simplecov', :require => false
 end

http://git-wip-us.apache.org/repos/asf/deltacloud/blob/fd262d70/client/tests/test_helper.rb
----------------------------------------------------------------------
diff --git a/client/tests/test_helper.rb b/client/tests/test_helper.rb
index a238a73..2189911 100644
--- a/client/tests/test_helper.rb
+++ b/client/tests/test_helper.rb
@@ -13,13 +13,13 @@
 # License for the specific language governing permissions and limitations
 # under the License.
 
-require 'bundler'
-
-Bundler.setup(:default, :development)
+require 'bundler/setup'
 Bundler.require(:default, :development)
 
 require 'require_relative' if RUBY_VERSION < '1.9'
 
+Turn.config.format = :dot
+
 if ENV['COVERAGE']
   require 'simplecov'
   SimpleCov.command_name 'tests:units'


Mime
View raw message