Merge branch 'release/0.4.2'

adhearsion · Feb 4, 2016 · eaa6cbc · eaa6cbc
2 parents 55a9f0f + 6ed1ebf
commit eaa6cbc
Show file tree

Hide file tree

Showing 5 changed files with 7 additions and 3 deletions.
diff --git a/.gitignore b/.gitignore
@@ -1,2 +1,3 @@
 *.swp
 Gemfile.lock
+pkg
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,5 +1,8 @@
 # [develop](https://github.com/adhearsion/electric_slide)
 
+# [0.4.2](https://github.com/adhearsion/electric_slide/compare/v0.4.1...v0.4.2) - [2016-02-04](https://rubygems.org/gems/adhearsion/versions/0.4.2)
+  * Bugfix: FixedPriority now correctly checks out agents in priority order.
+
 # [0.4.1](https://github.com/adhearsion/electric_slide/compare/v0.4.0...v0.4.1) - [2016-01-04](https://rubygems.org/gems/adhearsion/versions/0.4.1)
   * Bugfix: Don't hand out internal CallQueue references to Agents - thread-safety
 

diff --git a/lib/electric_slide/agent_strategy/fixed_priority.rb b/lib/electric_slide/agent_strategy/fixed_priority.rb
@@ -30,7 +30,7 @@ def available_agent_summary
       end
 
       def checkout_agent
-        _, agents = @priorities.detect do |priority, agents|
+        _, agents = @priorities.sort.detect do |priority, agents|
           agents.present?
         end
         agents.shift

diff --git a/lib/electric_slide/version.rb b/lib/electric_slide/version.rb
@@ -1,4 +1,4 @@
 # encoding: utf-8
 class ElectricSlide
-  VERSION = '0.4.1'
+  VERSION = '0.4.2'
 end
diff --git a/spec/electric_slide/agent_strategy/fixed_priority_spec.rb b/spec/electric_slide/agent_strategy/fixed_priority_spec.rb
@@ -23,9 +23,9 @@
     agent1 = OpenStruct.new({ id: 101, priority: 2 })
     agent2 = OpenStruct.new({ id: 102, priority: 2 })
     agent3 = OpenStruct.new({ id: 103, priority: 3 })
+    subject << agent3
     subject << agent1
     subject << agent2
-    subject << agent3
     expect(subject.checkout_agent).to eql(agent1)
     expect(subject.checkout_agent).to eql(agent2)
     expect(subject.checkout_agent).to eql(agent3)