Merge pull request #112 from wp-cli/refine-feature-files

Author: swissspidy

features/dist-archive.feature

@@ -476,27 +476,27 @@ Feature: Generate a distribution archive of a project
 
     When I try `zipinfo -1 foo.zip`
     Then STDOUT should contain:
-    """
-    foo/bar.txt
-    """
+      """
+      foo/bar.txt
+      """
     And STDOUT should contain:
-    """
-    foo/foo.txt
-    """
+      """
+      foo/foo.txt
+      """
 
     When I run `echo "foo.txt" > foo/.distignore`
     And I try `wp dist-archive foo --force`
     Then the foo.zip file should exist
 
     When I try `zipinfo -1 foo.zip`
     Then STDOUT should contain:
-    """
-    foo/bar.txt
-    """
+      """
+      foo/bar.txt
+      """
     And STDOUT should not contain:
-    """
-    foo/foo.txt
-    """
+      """
+      foo/foo.txt
+      """
 
   Scenario: Removes existing files in the tarball
     Given an empty directory
@@ -517,24 +517,24 @@ Feature: Generate a distribution archive of a project
 
     When I try `tar -tf foo.tar.gz`
     Then STDOUT should contain:
-    """
-    foo/bar.txt
-    """
+      """
+      foo/bar.txt
+      """
     And STDOUT should contain:
-    """
-    foo/foo.txt
-    """
+      """
+      foo/foo.txt
+      """
 
     When I run `echo "foo.txt" > foo/.distignore`
     And I try `wp dist-archive foo --format=targz --force`
     Then the foo.tar.gz file should exist
 
     When I try `tar -tf foo.tar.gz`
     Then STDOUT should contain:
-    """
-    foo/bar.txt
-    """
+      """
+      foo/bar.txt
+      """
     And STDOUT should not contain:
-    """
-    foo/foo.txt
-    """
+      """
+      foo/foo.txt
+      """

features/distignore.feature

@@ -1,6 +1,6 @@
 # The "Examples" dataprovider is needed due to differences in zip and tar.
 @require-php-7.1
-Feature: Generate a distribution archive of a project
+Feature: Generate a distribution archive of a project with .distignore
 
   Scenario: Ignores backup files with a period and tilde
     Given an empty directory
@@ -100,10 +100,8 @@ Feature: Generate a distribution archive of a project
       <?php
       echo 'Hello world';
       """
-
-    Then the foo/.git directory should exist
-
-    Then the foo/.git/subfolder/version.control file should exist
+    And the foo/.git directory should exist
+    And the foo/.git/subfolder/version.control file should exist
 
     When I run `wp dist-archive foo --format=<format>`
     Then STDOUT should match /^Success: Created foo.<extension> \(Size: \d+(?:\.\d*)? [a-zA-Z]{1,3}\)$/