4 files changed, 51 insertions, 5 deletions
diff --git a/spec/decorators/referential_decorator_spec.rb b/spec/decorators/referential_decorator_spec.rb
index cbeaf2407..879ab7d4b 100644
--- a/spec/decorators/referential_decorator_spec.rb
+++ b/spec/decorators/referential_decorator_spec.rb
@@ -1,4 +1,5 @@
 RSpec.describe ReferentialDecorator, type: [:helper, :decorator] do
+  include Support::DecoratorHelpers
 
   let( :object ){ build_stubbed :referential }
   let( :referential ){ object }
diff --git a/spec/decorators/stop_area_decorator_spec.rb b/spec/decorators/stop_area_decorator_spec.rb
new file mode 100644
index 000000000..fd6aa207a
--- /dev/null
+++ b/spec/decorators/stop_area_decorator_spec.rb
@@ -0,0 +1,25 @@
+require "rails_helper"
+
+RSpec.describe StopAreaDecorator do
+
+  let(:stop_area) { Chouette::StopArea.new }
+  let(:decorator) { stop_area.decorate }
+
+  describe '#waiting_time_text' do
+    it "returns '-' when waiting_time is nil" do
+      stop_area.waiting_time = nil
+      expect(decorator.waiting_time_text).to eq('-')
+    end
+
+    it "returns '-' when waiting_time is zero" do
+      stop_area.waiting_time = 0
+      expect(decorator.waiting_time_text).to eq('-')
+    end
+
+    it "returns '120 minutes' when waiting_time is 120" do
+      stop_area.waiting_time = 120
+      expect(decorator.waiting_time_text).to eq('120 minutes')
+    end
+  end
+
+end
diff --git a/spec/models/chouette/stop_area_spec.rb b/spec/models/chouette/stop_area_spec.rb
index c6aeafaf8..bec8c0868 100644
--- a/spec/models/chouette/stop_area_spec.rb
+++ b/spec/models/chouette/stop_area_spec.rb
@@ -426,5 +426,30 @@ describe Chouette::StopArea, :type => :model do
   #     end
   # end
 
+  describe '#waiting_time' do
+
+    let(:stop_area) { FactoryGirl.build :stop_area }
+
+    it 'can be nil' do
+      stop_area.waiting_time = nil
+      expect(stop_area).to be_valid
+    end
+
+    it 'can be zero' do
+      stop_area.waiting_time = 0
+      expect(stop_area).to be_valid
+    end
+
+    it 'can be positive' do
+      stop_area.waiting_time = 120
+      expect(stop_area).to be_valid
+    end
+
+    it "can't be negative" do
+      stop_area.waiting_time = -1
+      expect(stop_area).to_not be_valid
+    end
+
+  end
 
 end
diff --git a/spec/support/decorator_helpers.rb b/spec/support/decorator_helpers.rb
index ffedd479b..9d450deb1 100644
--- a/spec/support/decorator_helpers.rb
+++ b/spec/support/decorator_helpers.rb
@@ -1,5 +1,4 @@
 module Support
-
   module DecoratorHelpers
     def self.included(into)
       into.instance_eval do
@@ -21,7 +20,3 @@ module Support
     end
   end
 end
-
-RSpec.configure do | c |
-  c.include Support::DecoratorHelpers, type: :decorator
-end