Release a new beta.5.1-beta4

7 files changed, 118 insertions, 62 deletions

diff --git a/test/functional/backup_jobs_controller_test.rb b/test/functional/backup_jobs_controller_test.rb
new file mode 100644
index 0000000..17a0caf
--- /dev/null
+++ b/test/functional/backup_jobs_controller_test.rb
@@ -0,0 +1,49 @@
+require 'test_helper'
+
+class BackupJobsControllerTest < ActionController::TestCase
+  setup do
+    @backup_job = backup_jobs(:one)
+  end
+
+  test "should get index" do
+    get :index
+    assert_response :success
+    assert_not_nil assigns(:backup_jobs)
+  end
+
+  test "should get new" do
+    get :new
+    assert_response :success
+  end
+
+  test "should create backup_job" do
+    assert_difference('BackupJob.count') do
+      post :create, backup_job: @backup_job.attributes
+    end
+
+    assert_redirected_to backup_job_path(assigns(:backup_job))
+  end
+
+  test "should show backup_job" do
+    get :show, id: @backup_job.to_param
+    assert_response :success
+  end
+
+  test "should get edit" do
+    get :edit, id: @backup_job.to_param
+    assert_response :success
+  end
+
+  test "should update backup_job" do
+    put :update, id: @backup_job.to_param, backup_job: @backup_job.attributes
+    assert_redirected_to backup_job_path(assigns(:backup_job))
+  end
+
+  test "should destroy backup_job" do
+    assert_difference('BackupJob.count', -1) do
+      delete :destroy, id: @backup_job.to_param
+    end
+
+    assert_redirected_to backup_jobs_path
+  end
+end
diff --git a/test/functional/intruders_controller_test.rb b/test/functional/intruders_controller_test.rb
new file mode 100644
index 0000000..0896022
--- /dev/null
+++ b/test/functional/intruders_controller_test.rb
@@ -0,0 +1,49 @@
+require 'test_helper'
+
+class IntrudersControllerTest < ActionController::TestCase
+  setup do
+    @intruder = intruders(:one)
+  end
+
+  test "should get index" do
+    get :index
+    assert_response :success
+    assert_not_nil assigns(:intruders)
+  end
+
+  test "should get new" do
+    get :new
+    assert_response :success
+  end
+
+  test "should create intruder" do
+    assert_difference('Intruder.count') do
+      post :create, intruder: @intruder.attributes
+    end
+
+    assert_redirected_to intruder_path(assigns(:intruder))
+  end
+
+  test "should show intruder" do
+    get :show, id: @intruder.to_param
+    assert_response :success
+  end
+
+  test "should get edit" do
+    get :edit, id: @intruder.to_param
+    assert_response :success
+  end
+
+  test "should update intruder" do
+    put :update, id: @intruder.to_param, intruder: @intruder.attributes
+    assert_redirected_to intruder_path(assigns(:intruder))
+  end
+
+  test "should destroy intruder" do
+    assert_difference('Intruder.count', -1) do
+      delete :destroy, id: @intruder.to_param
+    end
+
+    assert_redirected_to intruders_path
+  end
+end
diff --git a/test/functional/system_messages_controller_test.rb b/test/functional/system_messages_controller_test.rb
deleted file mode 100644
index 2894cd3..0000000
--- a/test/functional/system_messages_controller_test.rb
+++ /dev/null
@@ -1,49 +0,0 @@
-require 'test_helper'
-
-class SystemMessagesControllerTest < ActionController::TestCase
-  setup do
-    @system_message = system_messages(:one)
-  end
-
-  test "should get index" do
-    get :index
-    assert_response :success
-    assert_not_nil assigns(:system_messages)
-  end
-
-  test "should get new" do
-    get :new
-    assert_response :success
-  end
-
-  test "should create system_message" do
-    assert_difference('SystemMessage.count') do
-      post :create, system_message: @system_message.attributes
-    end
-
-    assert_redirected_to system_message_path(assigns(:system_message))
-  end
-
-  test "should show system_message" do
-    get :show, id: @system_message.to_param
-    assert_response :success
-  end
-
-  test "should get edit" do
-    get :edit, id: @system_message.to_param
-    assert_response :success
-  end
-
-  test "should update system_message" do
-    put :update, id: @system_message.to_param, system_message: @system_message.attributes
-    assert_redirected_to system_message_path(assigns(:system_message))
-  end
-
-  test "should destroy system_message" do
-    assert_difference('SystemMessage.count', -1) do
-      delete :destroy, id: @system_message.to_param
-    end
-
-    assert_redirected_to system_messages_path
-  end
-end
diff --git a/test/unit/backup_job_test.rb b/test/unit/backup_job_test.rb
new file mode 100644
index 0000000..a63c219
--- /dev/null
+++ b/test/unit/backup_job_test.rb
@@ -0,0 +1,7 @@
+require 'test_helper'
+
+class BackupJobTest < ActiveSupport::TestCase
+  def test_should_be_valid
+    assert BackupJob.new.valid?
+  end
+end
diff --git a/test/unit/callthrough_test.rb b/test/unit/callthrough_test.rb
index 5764c0d..2e8cc56 100644
--- a/test/unit/callthrough_test.rb
+++ b/test/unit/callthrough_test.rb
@@ -12,7 +12,7 @@ class CallthroughTest < ActiveSupport::TestCase
     @gemeinschaft_setup.country  = Country.first
     @gemeinschaft_setup.language = Language.first
 
-    @current_user = @gemeinschaft_setup.build_user(
+    current_user = @gemeinschaft_setup.build_user(
                                             :user_name => I18n.t('gemeinschaft_setups.initial_setup.admin_name'), 
                                             :male => true,
                                             :email => 'admin@localhost',
@@ -52,18 +52,18 @@ class CallthroughTest < ActiveSupport::TestCase
     @tenant.did_list = '02622-70648-x, 02622-706480'
     @tenant.save
 
-  @tenant.tenant_memberships.create(:user_id => @current_user.id)
-  @current_user.update_attributes!(:current_tenant_id => @tenant.id)
+  @tenant.tenant_memberships.create(:user_id => current_user.id)
+  current_user.update_attributes!(:current_tenant_id => @tenant.id)
 
   # The first user becomes a member of the 'admin' UserGroup
   #
   admin_group = @tenant.user_groups.create(:name => I18n.t('gemeinschaft_setups.initial_setup.admin_group_name'))
-  admin_group.users << @current_user
+  admin_group.users << current_user
 
   # User group
   #
   user_group = @tenant.user_groups.create(:name => I18n.t('gemeinschaft_setups.initial_setup.user_group_name'))
-  user_group.users << @current_user
+  user_group.users << current_user
 
   # Generate the internal_extensions
   #
@@ -84,7 +84,7 @@ class CallthroughTest < ActiveSupport::TestCase
     #
     assert @gemeinschaft_setup.valid?
     assert @sip_domain.valid?
-    assert @current_user.valid?
+    assert current_user.valid?
 
     assert @tenant.valid?
 
diff --git a/test/unit/intruder_test.rb b/test/unit/intruder_test.rb
new file mode 100644
index 0000000..f1b7963
--- /dev/null
+++ b/test/unit/intruder_test.rb
@@ -0,0 +1,7 @@
+require 'test_helper'
+
+class IntruderTest < ActiveSupport::TestCase
+  def test_should_be_valid
+    assert Intruder.new.valid?
+  end
+end
diff --git a/test/unit/system_message_test.rb b/test/unit/system_message_test.rb
deleted file mode 100644
index 0476ac8..0000000
--- a/test/unit/system_message_test.rb
+++ /dev/null
@@ -1,7 +0,0 @@
-require 'test_helper'
-
-class SystemMessageTest < ActiveSupport::TestCase
-  # def test_should_be_valid
-  #   assert SystemMessage.new.valid?
-  # end
-end