From 1f624e136785893d0c9e4bfeb1a12f9c08693a24 Mon Sep 17 00:00:00 2001
From: Marc Alexander <admin@m-a-styles.de>
Date: Thu, 24 Oct 2013 21:41:41 +0200
Subject: [ticket/11842] Replace outdated occurences of user and group
 avatar_type

user_avatar_type und group_avatar_type are now a string and should therefore
be treated accordingly.

PHPBB3-11842
---
 tests/functions_user/group_user_attributes_test.php | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

(limited to 'tests')

diff --git a/tests/functions_user/group_user_attributes_test.php b/tests/functions_user/group_user_attributes_test.php
index f8d52a9a6a..5ed60f6593 100644
--- a/tests/functions_user/group_user_attributes_test.php
+++ b/tests/functions_user/group_user_attributes_test.php
@@ -27,7 +27,7 @@ class phpbb_functions_user_group_user_attributes_test extends phpbb_database_tes
 				2,
 				array(
 					'group_avatar'	=> '',
-					'group_avatar_type'		=> 0,
+					'group_avatar_type'		=> '',
 					'group_avatar_height'	=> 0,
 					'group_avatar_width'	=> 0,
 					'group_rank'	=> 0,
@@ -43,7 +43,7 @@ class phpbb_functions_user_group_user_attributes_test extends phpbb_database_tes
 				2,
 				array(
 					'group_avatar'	=> '',
-					'group_avatar_type'		=> 0,
+					'group_avatar_type'		=> '',
 					'group_avatar_height'	=> 0,
 					'group_avatar_width'	=> 0,
 					'group_rank'	=> 0,
@@ -59,7 +59,7 @@ class phpbb_functions_user_group_user_attributes_test extends phpbb_database_tes
 				2,
 				array(
 					'group_avatar'	=> '',
-					'group_avatar_type'		=> 0,
+					'group_avatar_type'		=> '',
 					'group_avatar_height'	=> 0,
 					'group_avatar_width'	=> 0,
 					'group_rank'	=> 0,
@@ -75,7 +75,7 @@ class phpbb_functions_user_group_user_attributes_test extends phpbb_database_tes
 				3,
 				array(
 					'group_avatar'	=> 'default2',
-					'group_avatar_type'		=> 1,
+					'group_avatar_type'		=> 'avatar.driver.upload',
 					'group_avatar_height'	=> 1,
 					'group_avatar_width'	=> 1,
 					'group_rank'	=> 3,
@@ -91,7 +91,7 @@ class phpbb_functions_user_group_user_attributes_test extends phpbb_database_tes
 				3,
 				array(
 					'group_avatar'	=> 'default2',
-					'group_avatar_type'		=> 1,
+					'group_avatar_type'		=> 'avatar.driver.upload',
 					'group_avatar_height'	=> 1,
 					'group_avatar_width'	=> 1,
 					'group_rank'	=> 3,
@@ -107,7 +107,7 @@ class phpbb_functions_user_group_user_attributes_test extends phpbb_database_tes
 				3,
 				array(
 					'group_avatar'	=> 'default2',
-					'group_avatar_type'		=> 1,
+					'group_avatar_type'		=> 'avatar.driver.upload',
 					'group_avatar_height'	=> 1,
 					'group_avatar_width'	=> 1,
 					'group_rank'	=> 3,
-- 
cgit v1.2.1


From abb2def48d7a946fd4d0a67f88682c9fa2556223 Mon Sep 17 00:00:00 2001
From: Marc Alexander <admin@m-a-styles.de>
Date: Wed, 4 Dec 2013 15:42:17 +0100
Subject: [ticket/11842] Use avatar_data for obtaining driver that should be
 deleted

PHPBB3-11842
---
 tests/functional/avatar_acp_groups_test.php | 9 +++++++++
 1 file changed, 9 insertions(+)

(limited to 'tests')

diff --git a/tests/functional/avatar_acp_groups_test.php b/tests/functional/avatar_acp_groups_test.php
index 5e908bc6da..5f767b44f2 100644
--- a/tests/functional/avatar_acp_groups_test.php
+++ b/tests/functional/avatar_acp_groups_test.php
@@ -69,4 +69,13 @@ class phpbb_functional_avatar_acp_groups_test extends phpbb_functional_common_av
 	{
 		$this->assert_avatar_submit($expected, $avatar_type, $data);
 	}
+
+	// Test if avatar was really deleted
+	public function test_no_avatar_acp_groups()
+	{
+		$crawler = self::request('GET', $this->get_url() . '&sid=' . $this->sid);
+		$form = $crawler->selectButton($this->lang('SUBMIT'))->form();
+		$form_data = $form->getValues();
+		$this->assertEmpty($form_data['avatar_type']);
+	}
 }
-- 
cgit v1.2.1


From 80fa658e8fc94972349b5f0d01f93afba7744e0e Mon Sep 17 00:00:00 2001
From: Marc Alexander <admin@m-a-styles.de>
Date: Wed, 4 Dec 2013 15:58:07 +0100
Subject: [ticket/11842] Add functional test for creating group

PHPBB3-11842
---
 tests/functional/group_create_test.php | 31 +++++++++++++++++++++++++++++++
 1 file changed, 31 insertions(+)
 create mode 100644 tests/functional/group_create_test.php

(limited to 'tests')

diff --git a/tests/functional/group_create_test.php b/tests/functional/group_create_test.php
new file mode 100644
index 0000000000..96780069f7
--- /dev/null
+++ b/tests/functional/group_create_test.php
@@ -0,0 +1,31 @@
+<?php
+/**
+*
+* @package testing
+* @copyright (c) 2013 phpBB Group
+* @license http://opensource.org/licenses/gpl-2.0.php GNU General Public License v2
+*
+*/
+
+/**
+* @group functional
+*/
+class phpbb_functional_group_create_test extends phpbb_functional_test_case
+{
+
+	public function test_create_group()
+	{
+		$this->login();
+		$this->admin_login();
+		$this->add_lang('acp/groups');
+
+		$crawler = self::request('GET', 'adm/index.php?i=acp_groups&mode=manage&sid=' . $this->sid);
+		$form = $crawler->selectButton($this->lang('SUBMIT'))->form();
+		$crawler = self::submit($form, array('group_name' => 'testtest'));
+
+		$form = $crawler->selectButton($this->lang('SUBMIT'))->form();
+		$crawler = self::submit($form, array('group_name' => 'testtest'));
+
+		$this->assertContainsLang('GROUP_CREATED', $crawler->filter('#main')->text());
+	}
+}
-- 
cgit v1.2.1