Skip to content

Commit

Permalink
Fix failing tests
Browse files Browse the repository at this point in the history
Set explicit sass-rails version to help travis resolve dependencies
  • Loading branch information
mariochavez committed Jun 11, 2014
1 parent 8c3d0ba commit 01ff73a
Show file tree
Hide file tree
Showing 3 changed files with 6 additions and 5 deletions.
2 changes: 1 addition & 1 deletion .travis.yml
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
language: ruby
rvm:
- 1.9.3
- 2.0.0
- 2.1.2
4 changes: 2 additions & 2 deletions api_taster.gemspec
Original file line number Diff line number Diff line change
Expand Up @@ -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'

Expand Down
5 changes: 3 additions & 2 deletions spec/route_spec.rb
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down

0 comments on commit 01ff73a

Please sign in to comment.