Skip to content

Commit ede0f45

Browse files
Drop Rails 3 and Ruby 1.9.3 from CI, add newer rubies
1 parent 00e6146 commit ede0f45

File tree

6 files changed

+52
-20
lines changed

6 files changed

+52
-20
lines changed

.travis.yml

+3-2
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,14 @@
11
language: ruby
22
sudo: false
33
rvm:
4-
- 1.9.3
54
- 2.0.0
65
- 2.1.2
6+
- 2.2.5
7+
- 2.3.1
78
gemfile:
8-
- gemfiles/rails_3.gemfile
99
- gemfiles/rails_4.gemfile
1010
- gemfiles/rails_4.1.gemfile
11+
- gemfiles/rails_4.2.gemfile
1112
services:
1213
- redis-server
1314
env:

gemfiles/rails_4.2.gemfile

+32
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,32 @@
1+
source 'http://rubygems.org'
2+
3+
gem 'jquery-rails'
4+
gem 'rails', '4.2.6'
5+
6+
if RUBY_VERSION < '2.1.0'
7+
gem 'devise', '~> 3.5.9' # hack to pass tests on travis
8+
end
9+
10+
group :assets do
11+
gem 'coffee-rails', '~> 4.0.1'
12+
end
13+
14+
group :test do
15+
gem 'capybara'
16+
gem 'database_cleaner'
17+
gem 'launchy'
18+
gem 'redis'
19+
gem 'simple_form'
20+
gem 'ransack'
21+
gem 'kaminari'
22+
gem 'fakeweb', '~> 1.3', :require => false
23+
gem 'test_declarative', :require => false
24+
gem 'mocha', :require => false
25+
end
26+
27+
group :development, :test do
28+
gem 'sqlite3'
29+
gem 'sass-rails', '~> 4.0.3'
30+
end
31+
32+
gemspec :path => "../"

test/fixtures/lit/locales.yml

+4-4
Original file line numberDiff line numberDiff line change
@@ -2,10 +2,10 @@
22

33
pl:
44
locale: pl
5-
created_at: <%= Time.now %>
6-
updated_at: <%= Time.now %>
5+
created_at: <%= Time.current %>
6+
updated_at: <%= Time.current %>
77

88
en:
99
locale: en
10-
created_at: <%= Time.now %>
11-
updated_at: <%= Time.now %>
10+
created_at: <%= Time.current %>
11+
updated_at: <%= Time.current %>
+6-6
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,14 @@
11
hello_world:
22
localization_key: 'scopes.hello_world'
3-
created_at: <%= Time.now %>
4-
updated_at: <%= Time.now %>
3+
created_at: <%= Time.current %>
4+
updated_at: <%= Time.current %>
55

66
array:
77
localization_key: 'scopes.array'
8-
created_at: <%= Time.now %>
9-
updated_at: <%= Time.now %>
8+
created_at: <%= Time.current %>
9+
updated_at: <%= Time.current %>
1010

1111
string:
1212
localization_key: 'scopes.string'
13-
created_at: <%= Time.now %>
14-
updated_at: <%= Time.now %>
13+
created_at: <%= Time.current %>
14+
updated_at: <%= Time.current %>

test/fixtures/lit/localizations.yml

+4-4
Original file line numberDiff line numberDiff line change
@@ -5,8 +5,8 @@ string:
55
localization_key: array
66
translated_value: value
77
default_value: value
8-
created_at: <%= Time.now %>
9-
updated_at: <%= Time.now %>
8+
created_at: <%= Time.current %>
9+
updated_at: <%= Time.current %>
1010

1111
array:
1212
locale: en
@@ -19,5 +19,5 @@ array:
1919
- one
2020
- two
2121
- three
22-
created_at: <%= Time.now %>
23-
updated_at: <%= Time.now %>
22+
created_at: <%= Time.current %>
23+
updated_at: <%= Time.current %>

test/fixtures/lit/sources.yml

+3-4
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,6 @@ test:
44
identifier: test
55
url: http://testhost.com/lit
66
api_key: test
7-
last_updated_at: 2013-09-23 18:21:41
8-
created_at: <%= Time.now %>
9-
updated_at: <%= Time.now %>
10-
7+
last_updated_at: '2013-09-23 18:21:41'
8+
updated_at: <%= Time.current %>
9+
created_at: <%= Time.current %>

0 commit comments

Comments
 (0)