Skip to content

Fix tests #33

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 5 commits into
base: develop
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 3 additions & 2 deletions Appraisals
Original file line number Diff line number Diff line change
Expand Up @@ -4,8 +4,9 @@ appraise 'rails4_2' do
end

appraise 'rails5_0' do
gem 'rails', '~> 4.2.9'
gem 'globalize', '~> 5.0.0'
gem 'devise', '~> 4.0'
gem 'rails', '~> 5.0.7.2'
gem 'globalize', '~> 5.1.0'
end

appraise 'rails5_1' do
Expand Down
2 changes: 1 addition & 1 deletion Gemfile
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@ gem 'uglifier'
gem 'jquery-rails'

# ActiveAdmin requires devise < 4.0
gem 'devise', '~> 3.2'
gem 'devise', '~> 3.5'

group :test do
gem 'sqlite3', '~> 1.3.5'
Expand Down
2 changes: 1 addition & 1 deletion gemfiles/rails4_2.gemfile
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ gem "coffee-rails"
gem "therubyracer", platforms: :ruby
gem "uglifier"
gem "jquery-rails"
gem "devise", "~> 3.2"
gem "devise", "~> 3.5"
gem "rails", "~> 4.2.9"
gem "globalize", "~> 5.0.0"

Expand Down
6 changes: 3 additions & 3 deletions gemfiles/rails5_0.gemfile
Original file line number Diff line number Diff line change
Expand Up @@ -7,9 +7,9 @@ gem "coffee-rails"
gem "therubyracer", platforms: :ruby
gem "uglifier"
gem "jquery-rails"
gem "devise", "~> 3.2"
gem "rails", "~> 4.2.9"
gem "globalize", "~> 5.0.0"
gem "devise", "~> 4.0"
gem "rails", "~> 5.0.7.2"
gem "globalize", "~> 5.1.0"

group :test do
gem "sqlite3", "~> 1.3.5"
Expand Down
2 changes: 2 additions & 0 deletions spec/dummy/app/assets/config/manifest.js
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
//= link application.js
//= link_directory ../stylesheets .css
1 change: 1 addition & 0 deletions spec/dummy/app/assets/javascripts/active_admin.js
Original file line number Diff line number Diff line change
@@ -1 +1,2 @@
//= require active_admin/base
//= require active_admin/active_admin_globalize.js
4 changes: 4 additions & 0 deletions spec/dummy/app/assets/stylesheets/active_admin.css.scss
Original file line number Diff line number Diff line change
@@ -1,3 +1,7 @@
/*
*= require active_admin/active_admin_globalize
*/

// SASS variable overrides must be declared before loading up Active Admin's styles.
//
// To view the variables that Active Admin provides, take a look at
Expand Down
6 changes: 4 additions & 2 deletions spec/models/article_spec.rb
Original file line number Diff line number Diff line change
Expand Up @@ -4,15 +4,17 @@
describe Article do

it 'should be translatable' do
Article.translates?.should be_true
Article.translates?.should be true
end

describe 'localized article' do

let(:article) { create(:localized_article) }
subject { article }

it { should have(3).translations }
it 'should have 3 translations' do
article.translations.size.should == 3
end

it 'should have italian translation' do
I18n.with_locale :it do
Expand Down