Merge branch 'more_deploy_fixes' into develop

This commit is contained in:
Emil Siverhall 2013-03-08 10:39:00 +01:00
commit 6a6c382d8a

@ -2,6 +2,7 @@ package se.su.dsv.scipro.notifications.panels;
import org.apache.wicket.util.tester.FormTester;
import org.junit.Before;
import org.junit.Ignore;
import org.junit.Test;
import org.mockito.ArgumentCaptor;
import org.mockito.invocation.InvocationOnMock;
@ -40,6 +41,7 @@ public class NotificationSettingsPanelTest extends SciProTest {
}
@Test
@Ignore("Ignored for now, this is not visible since implementation should handle areas, not keywords")
public void test_idea_keyword_hidden_for_non_employees() throws Exception {
// given
setRoles(Roles.SYSADMIN, Roles.ADMIN, Roles.EXTERNAL, Roles.STUDENT);
@ -52,6 +54,7 @@ public class NotificationSettingsPanelTest extends SciProTest {
}
@Test
@Ignore("Ignored for now, this is not visible since implementation should handle areas, not keywords")
public void test_idea_keyword_shows_for_employee() throws Exception {
// given
setRoles(Roles.EMPLOYEE);
@ -64,6 +67,7 @@ public class NotificationSettingsPanelTest extends SciProTest {
}
@Test
@Ignore("Ignored for now, this is not visible since implementation should handle areas, not keywords")
public void test_saves_idea_keyword_notification_setting() throws Exception {
// given
setRoles(Roles.EMPLOYEE);