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

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

2 files changed, 98 insertions, 0 deletions

diff --git a/test/functional/call_routes_controller_test.rb b/test/functional/call_routes_controller_test.rb
new file mode 100644
index 0000000..77c0b2a
--- /dev/null
+++ b/test/functional/call_routes_controller_test.rb
@@ -0,0 +1,49 @@
+require 'test_helper'
+
+class CallRoutesControllerTest < ActionController::TestCase
+  setup do
+    @call_route = call_routes(:one)
+  end
+
+  test "should get index" do
+    get :index
+    assert_response :success
+    assert_not_nil assigns(:call_routes)
+  end
+
+  test "should get new" do
+    get :new
+    assert_response :success
+  end
+
+  test "should create call_route" do
+    assert_difference('CallRoute.count') do
+      post :create, call_route: @call_route.attributes
+    end
+
+    assert_redirected_to call_route_path(assigns(:call_route))
+  end
+
+  test "should show call_route" do
+    get :show, id: @call_route.to_param
+    assert_response :success
+  end
+
+  test "should get edit" do
+    get :edit, id: @call_route.to_param
+    assert_response :success
+  end
+
+  test "should update call_route" do
+    put :update, id: @call_route.to_param, call_route: @call_route.attributes
+    assert_redirected_to call_route_path(assigns(:call_route))
+  end
+
+  test "should destroy call_route" do
+    assert_difference('CallRoute.count', -1) do
+      delete :destroy, id: @call_route.to_param
+    end
+
+    assert_redirected_to call_routes_path
+  end
+end
diff --git a/test/functional/route_elements_controller_test.rb b/test/functional/route_elements_controller_test.rb
new file mode 100644
index 0000000..3d7afaa
--- /dev/null
+++ b/test/functional/route_elements_controller_test.rb
@@ -0,0 +1,49 @@
+require 'test_helper'
+
+class RouteElementsControllerTest < ActionController::TestCase
+  setup do
+    @route_element = route_elements(:one)
+  end
+
+  test "should get index" do
+    get :index
+    assert_response :success
+    assert_not_nil assigns(:route_elements)
+  end
+
+  test "should get new" do
+    get :new
+    assert_response :success
+  end
+
+  test "should create route_element" do
+    assert_difference('RouteElement.count') do
+      post :create, route_element: @route_element.attributes
+    end
+
+    assert_redirected_to route_element_path(assigns(:route_element))
+  end
+
+  test "should show route_element" do
+    get :show, id: @route_element.to_param
+    assert_response :success
+  end
+
+  test "should get edit" do
+    get :edit, id: @route_element.to_param
+    assert_response :success
+  end
+
+  test "should update route_element" do
+    put :update, id: @route_element.to_param, route_element: @route_element.attributes
+    assert_redirected_to route_element_path(assigns(:route_element))
+  end
+
+  test "should destroy route_element" do
+    assert_difference('RouteElement.count', -1) do
+      delete :destroy, id: @route_element.to_param
+    end
+
+    assert_redirected_to route_elements_path
+  end
+end