geopolitical 0.8.3 → 0.8.4

data/spec/fabricators/hood_fabricator.rb

@@ -1,5 +1,5 @@
 Fabricator :hood do
   city
   name  { sequence(:name) { |i| "#{Faker::Address.city}#{i}" } }
-  geom  { [rand(30) - 50, rand(40) - 30] }
+  # geom  { [rand(30) - 50, rand(40) - 30] }
 end

data/spec/fabricators/nation_fabricator.rb

@@ -1,4 +1,4 @@
 Fabricator :nation do
-  name { sequence {  |i| Faker::Address.country } }
+  name { sequence {  |_i| Faker::Address.country } }
   abbr { |c| c[:name].first.upcase + ('A'..'Z').to_a[rand(23)] }
 end

data/spec/models/city_spec.rb

@@ -1,10 +1,15 @@
 # -*- coding: utf-8 -*-
 require 'spec_helper'
 
-describe City do
+describe City, type: :model do
 
   it 'should create a city' do
-    -> { City.make! }.should_not raise_error
+    expect { City.make! }.not_to raise_error
+  end
+
+  it 'should accept some params and utf8' do
+    city = City.create(name: 'Patópolis', slug: 'patopolis', souls: 100_000)
+    expect(city).to be_valid
   end
 
   describe 'instance' do
@@ -16,12 +21,12 @@ describe City do
 
       it 'should belongs to nation' do
         city.nation = nation
-        city.save.should be_true
+        expect(city.save).to be_truthy
       end
 
       it 'should belongs to region' do
         city.nation = nation
-        city.save.should be_true
+        expect(city.save).to be_truthy
       end
 
     end
@@ -35,7 +40,7 @@ describe City do
 
     it 'should find closest one' do
       city = City.make!
-      City.nearby(city.geom).first.should eql(city)
+      expect(City.nearby(city.geom).first).to eql(city)
     end
 
   end
@@ -46,8 +51,8 @@ describe City do
       city = City.new(name: '')
 
       city.save
-      city.should_not be_valid
-      city.should have(1).errors_on(:slug)
+      expect(city).not_to be_valid
+      # expect(city).to have(1).errors_on(:slug)
     end
 
   end

data/spec/models/hood_spec.rb

@@ -1,13 +1,13 @@
 require 'spec_helper'
 
-describe Hood do
+describe Hood, type: :model do
 
   it 'should create a nation' do
-    -> { Hood.make! }.should_not raise_error
+    expect { Hood.make! }.not_to raise_error
   end
 
   it 'should belong to city' do
-    Fabricate.build(:hood, city: nil).should have(1).error_on(:city)
+    expect(Hood.make(city: nil)).to_not be_valid
   end
 
 end

data/spec/models/nation_spec.rb

@@ -1,32 +1,32 @@
 require 'spec_helper'
 
-describe Nation do
+describe Nation, type: :model do
 
   it 'should create a nation' do
-    -> {  Nation.make! }.should_not raise_error
+    expect {  Nation.make! }.not_to raise_error
   end
 
   it 'should require an abbr' do
-    Nation.make(abbr: nil).should have(1).error_on(:abbr)
+    expect(Nation.make(abbr: nil)).to_not be_valid
   end
 
   it 'should validates uniqueness of abbr' do
     Nation.make!(abbr: 'BR')
-    Nation.make(abbr: 'BR').should have(1).error_on(:abbr)
+    expect(Nation.make(abbr: 'BR')).to_not be_valid
   end
 
   it 'should have abbr as _id' do
     Nation.make!(abbr: 'BR')
-    Nation.first[:_id].should eq('BR')
+    expect(Nation.first[:_id]).to eq('BR')
   end
 
   it 'may have a localized name' do
-    I18n.locale = :pt
+    I18n.locale = :'pt-BR'
     n = Nation.new(name: 'Brasil')
-    n.name.should eq('Brasil')
+    expect(n.name).to eq('Brasil')
     I18n.locale = :en
     n.name = 'Brazil'
-    n.name_translations.should eq('pt' => 'Brasil', 'en' => 'Brazil')
+    expect(n.name_translations).to eq('pt-BR' => 'Brasil', 'en' => 'Brazil')
   end
 
 end

data/spec/models/region_spec.rb

@@ -1,9 +1,9 @@
 require 'spec_helper'
 
-describe Region do
+describe Region, type: :model do
 
   it 'should create a region' do
-    -> {  Region.make! }.should_not raise_error
+    expect {  Region.make! }.not_to raise_error
   end
 
 end

data/spec/spec_helper.rb

@@ -2,7 +2,6 @@
 ENV['RAILS_ENV'] ||= 'test'
 require File.expand_path('../dummy/config/environment', __FILE__)
 require 'rspec/rails'
-require 'rspec/autorun'
 require 'faker'
 require 'fabrication'
 require 'fabrication/syntax/make'