diff --git a/tests/behat/behat.template.yml b/tests/behat/behat.template.yml index 419f221..451bd1c 100644 --- a/tests/behat/behat.template.yml +++ b/tests/behat/behat.template.yml @@ -15,6 +15,9 @@ default: drupal_root: '/path/to/drupal/root' api_driver: 'drupal' region_map: + # The region on panopoly_page where the body appears (frequently + # customized on child distributions). + Panopoly Page Content: '.bryant-content' # Regions for Panopoly Layouts Boxton Content: ".boxton-content" Bryant Content: ".bryant-content" diff --git a/tests/behat/behat.travis.yml b/tests/behat/behat.travis.yml index d688cfe..5e1e1e3 100644 --- a/tests/behat/behat.travis.yml +++ b/tests/behat/behat.travis.yml @@ -19,6 +19,9 @@ default: # drupal_root: "/path/to/drupal/root" api_driver: 'drupal' region_map: + # The region on panopoly_page where the body appears (frequently + # customized on child distributions). + Panopoly Page Content: '.bryant-content' # Regions for Panopoly Layouts Boxton Content: ".boxton-content" Bryant Content: ".bryant-content" diff --git a/tests/behat/features/bootstrap/FeatureContext.php b/tests/behat/features/bootstrap/FeatureContext.php index bb9341f..38007cf 100644 --- a/tests/behat/features/bootstrap/FeatureContext.php +++ b/tests/behat/features/bootstrap/FeatureContext.php @@ -28,7 +28,7 @@ class FeatureContext extends DrupalContext /** * Initializes context. - * Every scenario gets it's own context object. + * Every scenario gets its own context object. * * @param array $parameters context parameters (set them up through behat.yml) */ diff --git a/tests/behat/features/contentitem_widget.feature b/tests/behat/features/contentitem_widget.feature index b18d25e..b58f52e 100644 --- a/tests/behat/features/contentitem_widget.feature +++ b/tests/behat/features/contentitem_widget.feature @@ -10,7 +10,7 @@ Feature: Add content item And I am viewing a landing page When I customize this page with the Panels IPE And I click "Add new pane" - And I click "Add content item" + And I click "Add content item" in the "CTools modal" region Then I should see "Configure new Add content item" When I fill in the following: | exposed[title] | Lovely Vegetables | diff --git a/tests/behat/features/contentlist_widget.feature b/tests/behat/features/contentlist_widget.feature index 292d9b1..90aaed1 100644 --- a/tests/behat/features/contentlist_widget.feature +++ b/tests/behat/features/contentlist_widget.feature @@ -10,7 +10,7 @@ Feature: Add content list widget And I am viewing a landing page When I customize this page with the Panels IPE And I click "Add new pane" - And I click "Add content list" + And I click "Add content list" in the "CTools modal" region Then I should see "Configure new Add content list" When I fill in the following: | widget_title | Content Page List Asc 1 | diff --git a/tests/behat/features/contentpage.feature b/tests/behat/features/contentpage.feature index 1fda335..6b0c749 100644 --- a/tests/behat/features/contentpage.feature +++ b/tests/behat/features/contentpage.feature @@ -14,7 +14,10 @@ Feature: Add content page @api Scenario: Add a content page - When I press "Publish" + # Normally, here we'd press "Publish", however some child distribtions + # don't use 'save_draft', and this makes this test compatible with them. + #When I press "Publish" + When I press "edit-submit" Then the "h1" element should contain "Testing title" @api @javascript @@ -33,7 +36,8 @@ Feature: Add content page And I attach the file "screenshot.png" to "files[field_featured_image_und_0]" Then I should not see "The specified file panopoly.png could not be uploaded. The image is too small; the minimum dimensions are 300x200 pixels." When I fill in "Alt Text" with "Panopoly rocks" - And I press "Publish" + #And I press "Publish" + And I press "edit-submit" Then I should see the link "Edit" in the "Tabs" region When I click "Edit" in the "Tabs" region Then the "field_featured_image[und][0][alt]" field should contain "Panopoly rocks" diff --git a/tests/behat/features/file_widget.feature b/tests/behat/features/file_widget.feature index c1dba05..df3beb1 100644 --- a/tests/behat/features/file_widget.feature +++ b/tests/behat/features/file_widget.feature @@ -9,7 +9,7 @@ Feature: Add a file to a page And I am viewing a landing page When I customize this page with the Panels IPE And I click "Add new pane" - And I click "Add file" + And I click "Add file" in the "CTools modal" region Then I should see "Configure new Add file" @api @javascript diff --git a/tests/behat/features/image_widget.feature b/tests/behat/features/image_widget.feature index 9cad0d7..8717de3 100644 --- a/tests/behat/features/image_widget.feature +++ b/tests/behat/features/image_widget.feature @@ -10,7 +10,7 @@ Feature: Add image widget And I am viewing a landing page When I customize this page with the Panels IPE And I click "Add new pane" - And I click "Add image" + And I click "Add image" in the "CTools modal" region Then I should see "Configure new Add image" When I fill in the following: | Title | Testing image widget title | diff --git a/tests/behat/features/linkit.feature b/tests/behat/features/linkit.feature index 3d7fa70..d83d3ac 100644 --- a/tests/behat/features/linkit.feature +++ b/tests/behat/features/linkit.feature @@ -21,8 +21,11 @@ Feature: Link to page on the site When I click "Attributes" And I fill in "edit-linkit-title" with "Testing title" And I press "Insert link" - And I press "Publish" - Then I should see "Linkit Target" in the "a" element with the "title" attribute set to "Testing title" in the "Bryant Content" region + # Normally, here we'd press "Publish", however some child distribtions + # don't use 'save_draft', and this makes this test compatible with them. + #And I press "Publish" + And I press "edit-submit" + Then I should see "Linkit Target" in the "a" element with the "title" attribute set to "Testing title" in the "Panopoly Page Content" region When I click "Linkit Target" Then the "h1" element should contain "Linkit Target" @@ -33,7 +36,10 @@ Feature: Link to page on the site And I click "Attributes" And I fill in "edit-linkit-title" with "Testing title" And I press "Insert link" - And I press "Publish" - Then I should see "https://drupal.org/project/panopoly" in the "a" element with the "title" attribute set to "Testing title" in the "Bryant Content" region + # Normally, here we'd press "Publish", however some child distribtions + # don't use 'save_draft', and this makes this test compatible with them. + #And I press "Publish" + And I press "edit-submit" + Then I should see "https://drupal.org/project/panopoly" in the "a" element with the "title" attribute set to "Testing title" in the "Panopoly Page Content" region When I click "https://drupal.org/project/panopoly" Then the "h1" element should contain "Panopoly" diff --git a/tests/behat/features/links_widget.feature b/tests/behat/features/links_widget.feature index 9984810..9504009 100644 --- a/tests/behat/features/links_widget.feature +++ b/tests/behat/features/links_widget.feature @@ -10,7 +10,7 @@ Feature: Add links widget And I am viewing a landing page When I customize this page with the Panels IPE And I click "Add new pane" - And I click "Add links" + And I click "Add links" in the "CTools modal" region Then I should see "Configure new Add links" When I fill in the following: | title | Testing link title | diff --git a/tests/behat/features/livepreview.feature b/tests/behat/features/livepreview.feature index 542afee..0d23bc7 100644 --- a/tests/behat/features/livepreview.feature +++ b/tests/behat/features/livepreview.feature @@ -10,7 +10,7 @@ Feature: Live preview And I am viewing a landing page When I customize this page with the Panels IPE And I click "Add new pane" - And I click "Add table" + And I click "Add table" in the "CTools modal" region Then I should see "Configure new Add table" When I fill in "Title" with "Widget title" And I wait for live preview to finish @@ -43,7 +43,7 @@ Feature: Live preview And I am viewing a landing page When I customize this page with the Panels IPE And I click "Add new pane" - And I click "Add content list" + And I click "Add content list" in the "CTools modal" region Then I should see "Configure new Add content list" When I fill in "widget_title" with "Content list widget" And I wait for live preview to finish @@ -113,7 +113,7 @@ Feature: Live preview And I am viewing a landing page When I customize this page with the Panels IPE And I click "Add new pane" - And I click "Add text" + And I click "Add text" in the "CTools modal" region Then I should see "Configure new Add text" When I fill in "Title" with "Widget title" Then I should not see "Widget title" in the "Live preview" region @@ -128,7 +128,7 @@ Feature: Live preview And I am viewing a landing page When I customize this page with the Panels IPE And I click "Add new pane" - And I click "Add spotlight" + And I click "Add spotlight" in the "CTools modal" region Then I should see "Configure new Add spotlight" When I fill in "Description" with "Testing description" And I wait for live preview to finish diff --git a/tests/behat/features/maps_widget.feature b/tests/behat/features/maps_widget.feature index e4f5516..af9218e 100644 --- a/tests/behat/features/maps_widget.feature +++ b/tests/behat/features/maps_widget.feature @@ -10,7 +10,7 @@ Feature: Add map widget And I am viewing a landing page When I customize this page with the Panels IPE And I click "Add new pane" - And I click "Add map" + And I click "Add map" in the "CTools modal" region Then I should see "Configure new Add map" When I fill in the following: | Title | Widget title | diff --git a/tests/behat/features/pathauto.feature b/tests/behat/features/pathauto.feature index 7790ca9..59b8685 100644 --- a/tests/behat/features/pathauto.feature +++ b/tests/behat/features/pathauto.feature @@ -11,7 +11,10 @@ | Title | Testing title | | Editor | plain_text | | body[und][0][value] | Testing body | - And I press "Publish" + # Normally, here we'd press "Publish", however some child distribtions + # don't use 'save_draft', and this makes this test compatible with them. + #When I press "Publish" + When I press "edit-submit" Then the "h1" element should contain "Testing title" @api diff --git a/tests/behat/features/spotlight_widget.feature b/tests/behat/features/spotlight_widget.feature index 1927a44..a6c6668 100644 --- a/tests/behat/features/spotlight_widget.feature +++ b/tests/behat/features/spotlight_widget.feature @@ -9,7 +9,7 @@ Feature: Add spotlight widget And I am viewing a landing page When I customize this page with the Panels IPE And I click "Add new pane" - And I click "Add spotlight" + And I click "Add spotlight" in the "CTools modal" region Then I should see "Configure new Add spotlight" @api @javascript diff --git a/tests/behat/features/table_widget.feature b/tests/behat/features/table_widget.feature index 136f62c..fffedd4 100644 --- a/tests/behat/features/table_widget.feature +++ b/tests/behat/features/table_widget.feature @@ -9,7 +9,7 @@ Feature: Add table widget And I am viewing a landing page When I customize this page with the Panels IPE And I click "Add new pane" - And I click "Add table" + And I click "Add table" in the "CTools modal" region Then I should see "Configure new Add table" @api @javascript diff --git a/tests/behat/features/text_widget.feature b/tests/behat/features/text_widget.feature index eb27cd7..da91453 100644 --- a/tests/behat/features/text_widget.feature +++ b/tests/behat/features/text_widget.feature @@ -10,7 +10,7 @@ Feature: Add text widget And I am viewing a landing page When I customize this page with the Panels IPE And I click "Add new pane" - And I click "Add text" + And I click "Add text" in the "CTools modal" region Then I should see "Configure new Add text" When I fill in the following: | Title | Text widget title | diff --git a/tests/behat/features/video_widget.feature b/tests/behat/features/video_widget.feature index 0a9db05..41a243d 100644 --- a/tests/behat/features/video_widget.feature +++ b/tests/behat/features/video_widget.feature @@ -9,7 +9,7 @@ Feature: Add video widget And I am viewing a landing page When I customize this page with the Panels IPE And I click "Add new pane" in the "Boxton Content" region - And I click "Add video" + And I click "Add video" in the "CTools modal" region Then I should see "Configure new Add video" # TODO: About 10% of the time this test will hang with Firefox, so for now, diff --git a/tests/behat/features/wysiwyg.feature b/tests/behat/features/wysiwyg.feature index 513bc96..1c9317d 100644 --- a/tests/behat/features/wysiwyg.feature +++ b/tests/behat/features/wysiwyg.feature @@ -14,8 +14,11 @@ Feature: Use rich text editor Scenario Outline: Format text in the editor (first toolbar) When I click the "" button in the "edit-body-und-0-value" WYSIWYG editor And I type "Testing body" in the "edit-body-und-0-value" WYSIWYG editor - And I press "Publish" - Then I should see "Testing body" in the "" element with the "" CSS property set to "" in the "Bryant Content" region + # Normally, here we'd press "Publish", however some child distribtions + # don't use 'save_draft', and this makes this test compatible with them. + #And I press "Publish" + And I press "edit-submit" + Then I should see "Testing body" in the "" element with the "" CSS property set to "" in the "Panopoly Page Content" region Examples: | Action | Element | Property | Value | @@ -34,8 +37,9 @@ Feature: Use rich text editor When I expand the toolbar in the "edit-body-und-0-value" WYSIWYG editor And I click the "" button in the "edit-body-und-0-value" WYSIWYG editor And I type "Testing body" in the "edit-body-und-0-value" WYSIWYG editor - And I press "Publish" - Then I should see "Testing body" in the "" element with the "" CSS property set to "" in the "Bryant Content" region + #And I press "Publish" + And I press "edit-submit" + Then I should see "Testing body" in the "" element with the "" CSS property set to "" in the "Panopoly Page Content" region Examples: | Action | Element | Property | Value | @@ -73,10 +77,11 @@ Feature: Use rich text editor And I click the fake "Submit" button And I switch out of all frames # Save the whole node. - When I press "Publish" + #When I press "Publish" + When I press "edit-submit" # See the image on the view page. - Then I should see the "img" element in the "Bryant Content" region - And I should see the image alt "Sample alt text" in the "Bryant Content" region + Then I should see the "img" element in the "Panopoly Page Content" region + And I should see the image alt "Sample alt text" in the "Panopoly Page Content" region # TODO: About 10% of the time this test will hang with Firefox, so for now, # we will run in Chrome only on Travis-CI to get consistent builds. @@ -96,9 +101,10 @@ Feature: Use rich text editor And I click the fake "Submit" button And I switch out of all frames # Save the whole node. - When I press "Publish" + #When I press "Publish" + When I press "edit-submit" # See the image on the view page. - Then I should see the "iframe.media-youtube-player" element in the "Bryant Content" region + Then I should see the "iframe.media-youtube-player" element in the "Panopoly Page Content" region # TODO: About 10% of the time this test will hang with Firefox, so for now, # we will run in Chrome only on Travis-CI to get consistent builds. @@ -118,6 +124,7 @@ Feature: Use rich text editor And I click the fake "Submit" button And I switch out of all frames # Save the whole node. - When I press "Publish" + #When I press "Publish" + When I press "edit-submit" # See the image on the view page. - Then I should see the "iframe.media-vimeo-player" element in the "Bryant Content" region + Then I should see the "iframe.media-vimeo-player" element in the "Panopoly Page Content" region