aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--Gemfile6
-rw-r--r--Gemfile.lock2
-rw-r--r--spec/models/chouette/vehicle_journey_at_stop_spec.rb14
-rw-r--r--spec/presenters/chouette/geometry/general_presenter.rb1
4 files changed, 7 insertions, 16 deletions
diff --git a/Gemfile b/Gemfile
index 2fcd2bf21..ab7e2b5bf 100644
--- a/Gemfile
+++ b/Gemfile
@@ -94,15 +94,10 @@ gem 'ransack'
gem 'squeel'
gem 'enumerize', '~> 0.10.0'
-
-#gem 'ninoxe', '1.2.4'
-#gem 'ninoxe', git: 'https://github.com/afimb/ninoxe.git'
-#gem 'ninoxe', path: '../ninoxe'
gem 'foreigner', '~> 1.7.4'
gem 'deep_cloneable', '~> 2.0.0'
gem 'acts-as-taggable-on', '>= 3'
-
gem 'acts_as_list', '~> 0.6.0'
gem 'acts_as_tree', '~> 2.1.0', require: 'acts_as_tree'
@@ -132,7 +127,6 @@ group :development do
end
group :test, :development do
- gem 'awesome_print'
gem 'pry-rails'
gem 'rspec-rails', '~> 3.1.0'
gem 'fakeweb'
diff --git a/Gemfile.lock b/Gemfile.lock
index 3b97d82ae..a1f6e8b70 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -53,7 +53,6 @@ GEM
ast (2.0.0)
astrolabe (1.3.0)
parser (>= 2.2.0.pre.3, < 3.0)
- awesome_print (1.6.1)
bcrypt (3.1.10)
bcrypt (3.1.10-java)
better_errors (2.1.1)
@@ -473,7 +472,6 @@ DEPENDENCIES
acts_as_list (~> 0.6.0)
acts_as_tree (~> 2.1.0)
apartment (~> 1.0.0)
- awesome_print
better_errors
binding_of_caller
breadcrumbs_on_rails
diff --git a/spec/models/chouette/vehicle_journey_at_stop_spec.rb b/spec/models/chouette/vehicle_journey_at_stop_spec.rb
index f771e8286..fbd544a28 100644
--- a/spec/models/chouette/vehicle_journey_at_stop_spec.rb
+++ b/spec/models/chouette/vehicle_journey_at_stop_spec.rb
@@ -7,14 +7,14 @@ describe Chouette::VehicleJourneyAtStop, :type => :model do
describe "#exceeds_gap?" do
it "should return false if gap < 1.hour" do
- t1 = 1.minutes.ago
- t2 = 1.minutes.ago + 4.hour
- expect(subject.exceeds_gap?(t1, t2)).to be_truthy
+ t1 = Time.now
+ t2 = Time.now + 3.minutes
+ expect(subject.exceeds_gap?(t1, t2)).to be_falsey
end
- it "should return false if gap > 2.hour" do
- t1 = 1.minutes.ago
- t2 = 1.minutes.ago + 3.minutes
- expect(subject.exceeds_gap?(t1, t2)).to be_falsey
+ it "should return true if gap > 4.hour" do
+ t1 = Time.now
+ t2 = Time.now + (4.hours + 1.minutes)
+ expect(subject.exceeds_gap?(t1, t2)).to be_truthy
end
end
diff --git a/spec/presenters/chouette/geometry/general_presenter.rb b/spec/presenters/chouette/geometry/general_presenter.rb
index 8b1378917..e69de29bb 100644
--- a/spec/presenters/chouette/geometry/general_presenter.rb
+++ b/spec/presenters/chouette/geometry/general_presenter.rb
@@ -1 +0,0 @@
-