From 01ff73af7c6741fdaef06cfb72bc3741215efeea Mon Sep 17 00:00:00 2001 From: Mario A Chavez Date: Wed, 11 Jun 2014 20:19:04 +0000 Subject: [PATCH] Fix failing tests Set explicit sass-rails version to help travis resolve dependencies --- .travis.yml | 2 +- api_taster.gemspec | 4 ++-- spec/route_spec.rb | 5 +++-- 3 files changed, 6 insertions(+), 5 deletions(-) diff --git a/.travis.yml b/.travis.yml index 222078e..4c9dc22 100644 --- a/.travis.yml +++ b/.travis.yml @@ -1,4 +1,4 @@ language: ruby rvm: - 1.9.3 - - 2.0.0 + - 2.1.2 diff --git a/api_taster.gemspec b/api_taster.gemspec index 6363724..514c4a6 100644 --- a/api_taster.gemspec +++ b/api_taster.gemspec @@ -16,8 +16,8 @@ Gem::Specification.new do |s| s.add_dependency 'rails', '~> 4.1.0' s.add_dependency 'jquery-rails' - s.add_dependency 'sass-rails' - s.add_dependency 'bootstrap-sass', '~> 2.1' + s.add_dependency 'sass-rails', '~> 4.0.3' + s.add_dependency 'bootstrap-sass', '~> 3.1.0.0' s.add_dependency 'redcarpet' s.add_dependency 'remotipart', '~> 1.0' diff --git a/spec/route_spec.rb b/spec/route_spec.rb index d376568..ff93817 100644 --- a/spec/route_spec.rb +++ b/spec/route_spec.rb @@ -15,9 +15,10 @@ module ApiTaster :name => 'home', :verb => 'GET', :path => '/home', + :full_path => '/home', :reqs => { - :controller => 'application', - :action => 'home' + :action => 'home', + :controller => 'application' } } end