Merge branch 'develop' of github.com:amooma/GS5 into develop

Conflicts:
	misc/freeswitch/scripts/dialplan/router.lua

2 files changed, 14 insertions, 0 deletions

diff --git a/test/unit/call_route_test.rb b/test/unit/call_route_test.rb
new file mode 100644
index 0000000..5eb2e50
--- /dev/null
+++ b/test/unit/call_route_test.rb
@@ -0,0 +1,7 @@
+require 'test_helper'
+
+class CallRouteTest < ActiveSupport::TestCase
+  def test_should_be_valid
+    assert CallRoute.new.valid?
+  end
+end
diff --git a/test/unit/route_element_test.rb b/test/unit/route_element_test.rb
new file mode 100644
index 0000000..807a4ca
--- /dev/null
+++ b/test/unit/route_element_test.rb
@@ -0,0 +1,7 @@
+require 'test_helper'
+
+class RouteElementTest < ActiveSupport::TestCase
+  def test_should_be_valid
+    assert RouteElement.new.valid?
+  end
+end