Fixed a merging conflict.

Merge branch 'switchboard' into develop

Conflicts:
	app/models/sip_account.rb

2 files changed, 98 insertions, 0 deletions

diff --git a/test/functional/switchboard_entries_controller_test.rb b/test/functional/switchboard_entries_controller_test.rb
new file mode 100644
index 0000000..a20f39e
--- /dev/null
+++ b/test/functional/switchboard_entries_controller_test.rb
@@ -0,0 +1,49 @@
+require 'test_helper'
+
+class SwitchboardEntriesControllerTest < ActionController::TestCase
+  setup do
+    @switchboard_entry = switchboard_entries(:one)
+  end
+
+  test "should get index" do
+    get :index
+    assert_response :success
+    assert_not_nil assigns(:switchboard_entries)
+  end
+
+  test "should get new" do
+    get :new
+    assert_response :success
+  end
+
+  test "should create switchboard_entry" do
+    assert_difference('SwitchboardEntry.count') do
+      post :create, switchboard_entry: @switchboard_entry.attributes
+    end
+
+    assert_redirected_to switchboard_entry_path(assigns(:switchboard_entry))
+  end
+
+  test "should show switchboard_entry" do
+    get :show, id: @switchboard_entry.to_param
+    assert_response :success
+  end
+
+  test "should get edit" do
+    get :edit, id: @switchboard_entry.to_param
+    assert_response :success
+  end
+
+  test "should update switchboard_entry" do
+    put :update, id: @switchboard_entry.to_param, switchboard_entry: @switchboard_entry.attributes
+    assert_redirected_to switchboard_entry_path(assigns(:switchboard_entry))
+  end
+
+  test "should destroy switchboard_entry" do
+    assert_difference('SwitchboardEntry.count', -1) do
+      delete :destroy, id: @switchboard_entry.to_param
+    end
+
+    assert_redirected_to switchboard_entries_path
+  end
+end
diff --git a/test/functional/switchboards_controller_test.rb b/test/functional/switchboards_controller_test.rb
new file mode 100644
index 0000000..6831fc2
--- /dev/null
+++ b/test/functional/switchboards_controller_test.rb
@@ -0,0 +1,49 @@
+require 'test_helper'
+
+class SwitchboardsControllerTest < ActionController::TestCase
+  setup do
+    @switchboard = switchboards(:one)
+  end
+
+  test "should get index" do
+    get :index
+    assert_response :success
+    assert_not_nil assigns(:switchboards)
+  end
+
+  test "should get new" do
+    get :new
+    assert_response :success
+  end
+
+  test "should create switchboard" do
+    assert_difference('Switchboard.count') do
+      post :create, switchboard: @switchboard.attributes
+    end
+
+    assert_redirected_to switchboard_path(assigns(:switchboard))
+  end
+
+  test "should show switchboard" do
+    get :show, id: @switchboard.to_param
+    assert_response :success
+  end
+
+  test "should get edit" do
+    get :edit, id: @switchboard.to_param
+    assert_response :success
+  end
+
+  test "should update switchboard" do
+    put :update, id: @switchboard.to_param, switchboard: @switchboard.attributes
+    assert_redirected_to switchboard_path(assigns(:switchboard))
+  end
+
+  test "should destroy switchboard" do
+    assert_difference('Switchboard.count', -1) do
+      delete :destroy, id: @switchboard.to_param
+    end
+
+    assert_redirected_to switchboards_path
+  end
+end