Commit 05aaf2c0 authored by Steven Spinelli's avatar Steven Spinelli Committed by Cecilia Vela Gurovic
Browse files

Behat Bug 1804074 Adding journal entry from Journal block on page

Merge branch 'master' of https://git.mahara.org/mahara/mahara

* 'master' of https://git.mahara.org/mahara/mahara:
  Bug 1803616: SyntaxError: expected expression, got ';'
  Bug 1802180: Have a simplified group update webservice option
  Bug 1800422: Fixed z-index for custom-dropdown
  Bug 1803194: Need to include the user object
  Bug 1802205: All external links to be opened in new tab/window by default

Change-Id: Ibe0898d9326c0527cc6a4e937da9782b00c10eb0
parent 365b84b1
...@@ -19,7 +19,7 @@ Background: ...@@ -19,7 +19,7 @@ Background:
And the following "journalentries" exist: And the following "journalentries" exist:
| owner | ownertype | title | entry | blog | tags | draft | | owner | ownertype | title | entry | blog | tags | draft |
| celeste | user | I'm going to Mars! | I just passed my exam and am approved for a Mars Mission | Mars journal | Mars | 0 | | celeste | user | I'm going to Mars! | I just passed my exam and am approved for a Mars Mission | Mars journal | Mars | 0 |
| celeste | user | Spacefood | Spacefood is kind of gross if you don't cook it right | Mars journal | Mars,food | 0 | | celeste | user | Spacefood | Spacefood is kind of gross if you don't cook it right | Mars journal | Mars,food | 0 |
Given I log in as "celeste" with password "Kupuh1pa!" Given I log in as "celeste" with password "Kupuh1pa!"
And I choose "Pages and collections" in "Create" from main menu And I choose "Pages and collections" in "Create" from main menu
...@@ -27,7 +27,6 @@ Background: ...@@ -27,7 +27,6 @@ Background:
And I expand "Journals" node in the "blocktype sidebar" property And I expand "Journals" node in the "blocktype sidebar" property
Scenario: Add Journal block to the page Scenario: Add Journal block to the page
Given I follow "Journal" in the "blocktype sidebar" property Given I follow "Journal" in the "blocktype sidebar" property
And I press "Add" And I press "Add"
And I select the radio "Mars journal" And I select the radio "Mars journal"
...@@ -35,6 +34,22 @@ Scenario: Add Journal block to the page ...@@ -35,6 +34,22 @@ Scenario: Add Journal block to the page
And I display the page And I display the page
Then I should see "Spacefood is kind of gross" Then I should see "Spacefood is kind of gross"
# Adding a journal entry from a journal block on a portfolio page
Given I click on "Edit"
Then I should see "New entry"
When I follow "New entry"
Then I should see "New journal entry in journal \"Mars journal\""
When I fill in "Title *" with "Journal entry Added from Block"
And I set the following fields to these values:
| Entry * | The contents of this entry ABCD123 |
And I click on "Save entry"
Then I should see "Journal entry saved"
When I choose "Pages and collections" in "Create" from main menu
And I click on "Celeste's Page" panel menu
And I click on "Edit" in "Celeste's Page" panel menu
Then I should see "Journal entry Added from Block"
And I should see "The contents of this entry ABCD123"
Scenario: Add specific Journal entry to the page Scenario: Add specific Journal entry to the page
Given I follow "Journal entry" in the "blocktype sidebar" property Given I follow "Journal entry" in the "blocktype sidebar" property
And I press "Add" And I press "Add"
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment