Commits

Jeroen De Raedt  committed 6b9c7d8 Merge with conflicts

STRM-2100: Merge branch 'issue/STRM-2100'

Conflicts:
streams-jira-plugin/src/main/java/com/atlassian/streams/jira/builder/GeneralUpdateEntryBuilder.java
streams-jira-plugin/src/test/java/com/atlassian/streams/jira/builder/GeneralUpdateEntryBuilderTest.java

  • Participants
  • Parent commits 04ba05a, e8319ad

Comments (0)

Files changed (3)

+# Activity Streams
+
+## Description
+
+An activity stream is a list of events, displayed to a user in an attractive and interactive interface. They are usually recent activities by the current user and other people using the same social site(s) or system(s).
+
+An example is the [Activity Stream gadget](https://confluence.atlassian.com/display/JIRA/Adding+the+Activity+Stream+Gadget) used on JIRA dashboards.
+
+## Atlassian Developer?
+
+### Committing Guidelines
+
+Please see [the following guide](https://extranet.atlassian.com/x/Uouvdg) for committing to this module.
+
+### Builds
+
+The Bamboo builds for this project are on [BEAC](https://bamboo.extranet.atlassian.com/browse/STRM)
+
+## External User?
+
+### Issues
+
+Please raise any issues you find with this module in [JIRA](https://ecosystem.atlassian.net/browse/STRM)
+
+### Documentation
+
+[Activity Streams Third Party Developer Documentation](https://developer.atlassian.com/display/STREAMS/Activity+Streams)
+
+[Activity Streams Developer Documentation](https://ecosystem.atlassian.net/wiki/display/STRM/Activity+Streams+Developers+Guide)

File aggregator-plugin/src/main/resources/js/activity-streams-parent.js

                 // additional level of encoding for spaces because otherwise the spaces
             	// will be mistaken for value delimiters (STRM-1857); escape space as "_"
             	// and escape any existing "_" as "\_"
-                encodedValues.push(value[i].replace(/\+/g, "\\_").replace(/ /g, "_"));
+                encodedValues.push(value[i].replace(/_/g, "\\_").replace(/ /g, "_"));
             }
             value = encodedValues.join(' ');
         }

File ui-tests/src/test/java/it/com/atlassian/streams/uitests/AuthenticationForActivityStreamsTest.java

 
 import static com.atlassian.streams.testing.UiTestGroups.MULTI;
 import static org.hamcrest.MatcherAssert.assertThat;
+import static org.hamcrest.Matchers.containsString;
+import static org.hamcrest.Matchers.is;
 
 @RunWith(UiTestsTesterRunner.class)
 @TestGroups(MULTI)
-public class AuthenticationForActivityStreamsTest {
+public class AuthenticationForActivityStreamsTest
+{
 
     private static final String USER_PROFILE_PAGE_URL = "/secure/ViewProfile.jspa";
     private final String AUTHENTICATION_MESSAGE = "Additional information may be available, please authenticate for more information";
     private JiraViewProfilePage pageUnderTest;
 
     @Before
-    public void goToViewProfilePage() {
+    public void goToViewProfilePage()
+    {
         JiraTestedProduct product = TestedProductFactory.create(JiraTestedProduct.class, "jira-applinks-oauth", null);
         product.gotoLoginPage().login("user", "user", DashboardPage.class);
 
     }
 
     @Test
-    public void assertThatAuthenticationMessagesAreShown() {
+    public void assertThatAuthenticationMessagesAreShown()
+    {
 
         JiraProfileActivityStream activityStream = pageUnderTest.activityStreamView();
         assertThat(activityStream.getAuthenticationMessage(), containsString(AUTHENTICATION_MESSAGE));