From 4455c0f916fba496368410e6b7edf97735d8f868 Mon Sep 17 00:00:00 2001 From: Itamar Shapira Bar-Lev Date: Tue, 16 Jun 2015 20:46:06 +0300 Subject: [PATCH 1/3] Adding a test for features state --- .idea/misc.xml | 4 ++++ app/templates/behat/features/features.feature | 10 ++++++++++ 2 files changed, 14 insertions(+) create mode 100644 .idea/misc.xml create mode 100644 app/templates/behat/features/features.feature diff --git a/.idea/misc.xml b/.idea/misc.xml new file mode 100644 index 0000000..8662aa9 --- /dev/null +++ b/.idea/misc.xml @@ -0,0 +1,4 @@ + + + + \ No newline at end of file diff --git a/app/templates/behat/features/features.feature b/app/templates/behat/features/features.feature new file mode 100644 index 0000000..d547f40 --- /dev/null +++ b/app/templates/behat/features/features.feature @@ -0,0 +1,10 @@ +Feature: Features state + Make sure features are in the default state after installation, and that + there are no conflicts between features. + + @api + Scenario: Visit content pages with an authenticated user from another company. + Given I login with user "admin" + When I visit "admin/structure/features" + Then I should not see "Conflict" + And I should not see "Overridden" From ba90b92def7f934094ff4add191170b82c9b85a9 Mon Sep 17 00:00:00 2001 From: Itamar Shapira Bar-Lev Date: Tue, 16 Jun 2015 20:48:27 +0300 Subject: [PATCH 2/3] Removing meta file added by mistake --- .idea/misc.xml | 4 ---- 1 file changed, 4 deletions(-) delete mode 100644 .idea/misc.xml diff --git a/.idea/misc.xml b/.idea/misc.xml deleted file mode 100644 index 8662aa9..0000000 --- a/.idea/misc.xml +++ /dev/null @@ -1,4 +0,0 @@ - - - - \ No newline at end of file From ac736581d4ad3425f76e87fc1342f12bb7bc9c40 Mon Sep 17 00:00:00 2001 From: Itamar Shapira Bar-Lev Date: Tue, 16 Jun 2015 20:52:16 +0300 Subject: [PATCH 3/3] Fixing scenario description --- app/templates/behat/features/features.feature | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/templates/behat/features/features.feature b/app/templates/behat/features/features.feature index d547f40..6ece230 100644 --- a/app/templates/behat/features/features.feature +++ b/app/templates/behat/features/features.feature @@ -3,7 +3,7 @@ Feature: Features state there are no conflicts between features. @api - Scenario: Visit content pages with an authenticated user from another company. + Scenario: Visit the features page and check that there are no conflicts and no overridden features. Given I login with user "admin" When I visit "admin/structure/features" Then I should not see "Conflict"