You are viewing a plain text version of this content. The canonical link for it is here.
Posted to server-dev@james.apache.org by ad...@apache.org on 2017/01/24 14:09:16 UTC
james-project git commit: JAMES-1873 Ensure Trash folder exists for
JMAP users
Repository: james-project
Updated Branches:
refs/heads/master 9ff71bd26 -> 129480e17
JAMES-1873 Ensure Trash folder exists for JMAP users
Project: http://git-wip-us.apache.org/repos/asf/james-project/repo
Commit: http://git-wip-us.apache.org/repos/asf/james-project/commit/129480e1
Tree: http://git-wip-us.apache.org/repos/asf/james-project/tree/129480e1
Diff: http://git-wip-us.apache.org/repos/asf/james-project/diff/129480e1
Branch: refs/heads/master
Commit: 129480e17bb5dcd72d9a2ca1058d91c2b838d47e
Parents: 9ff71bd
Author: Raphael Ouazana <ra...@linagora.com>
Authored: Tue Jan 24 11:51:46 2017 +0100
Committer: Raphael Ouazana <ra...@linagora.com>
Committed: Tue Jan 24 11:51:46 2017 +0100
----------------------------------------------------------------------
.../james/jmap/methods/integration/GetMailboxesMethodTest.java | 4 ++--
.../java/org/apache/james/jmap/FirstUserConnectionFilter.java | 2 +-
2 files changed, 3 insertions(+), 3 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/james-project/blob/129480e1/server/protocols/jmap-integration-testing/jmap-integration-testing-common/src/test/java/org/apache/james/jmap/methods/integration/GetMailboxesMethodTest.java
----------------------------------------------------------------------
diff --git a/server/protocols/jmap-integration-testing/jmap-integration-testing-common/src/test/java/org/apache/james/jmap/methods/integration/GetMailboxesMethodTest.java b/server/protocols/jmap-integration-testing/jmap-integration-testing-common/src/test/java/org/apache/james/jmap/methods/integration/GetMailboxesMethodTest.java
index 0221bae..33f2666 100644
--- a/server/protocols/jmap-integration-testing/jmap-integration-testing-common/src/test/java/org/apache/james/jmap/methods/integration/GetMailboxesMethodTest.java
+++ b/server/protocols/jmap-integration-testing/jmap-integration-testing-common/src/test/java/org/apache/james/jmap/methods/integration/GetMailboxesMethodTest.java
@@ -259,8 +259,8 @@ public abstract class GetMailboxesMethodTest {
.then()
.statusCode(200)
.body(NAME, equalTo("mailboxes"))
- .body(ARGUMENTS + ".list", hasSize(3))
- .body(ARGUMENTS + ".list.name", hasItems("INBOX", "Outbox", "Sent"));
+ .body(ARGUMENTS + ".list", hasSize(4))
+ .body(ARGUMENTS + ".list.name", hasItems("INBOX", "Outbox", "Sent", "Trash"));
}
@Test
http://git-wip-us.apache.org/repos/asf/james-project/blob/129480e1/server/protocols/jmap/src/main/java/org/apache/james/jmap/FirstUserConnectionFilter.java
----------------------------------------------------------------------
diff --git a/server/protocols/jmap/src/main/java/org/apache/james/jmap/FirstUserConnectionFilter.java b/server/protocols/jmap/src/main/java/org/apache/james/jmap/FirstUserConnectionFilter.java
index f7354f7..8de6195 100644
--- a/server/protocols/jmap/src/main/java/org/apache/james/jmap/FirstUserConnectionFilter.java
+++ b/server/protocols/jmap/src/main/java/org/apache/james/jmap/FirstUserConnectionFilter.java
@@ -49,7 +49,7 @@ import com.google.common.collect.ImmutableList;
public class FirstUserConnectionFilter implements Filter {
- private static final ImmutableList<String> DEFAULT_MAILBOXES = ImmutableList.of("INBOX", "Outbox", "Sent");
+ private static final ImmutableList<String> DEFAULT_MAILBOXES = ImmutableList.of("INBOX", "Outbox", "Sent", "Trash");
private static final Logger LOGGER = LoggerFactory.getLogger(FirstUserConnectionFilter.class);
private final UsersRepository usersRepository;
private final MailboxManager mailboxManager;
---------------------------------------------------------------------
To unsubscribe, e-mail: server-dev-unsubscribe@james.apache.org
For additional commands, e-mail: server-dev-help@james.apache.org