[DRE-commits] [librarian-puppet] 20/97: Enable features passing

[Stig Sandbeck Mathisen]

This is an automated email from the git hooks/post-receive script.

ssm pushed a commit to branch master
in repository librarian-puppet.

commit bc843dbf7f28848a128c44a1c1a0e66cf377ef11
Author: Carlos Sanchez <csanchez at maestrodev.com>
Date:   Tue Dec 10 21:18:25 2013 +0100

    Enable features passing
    
    Install a module with conflicts
    Updating a module that is not in the Puppetfile
---
 features/install.feature | 3 +--
 features/update.feature  | 3 +--
 2 files changed, 2 insertions(+), 4 deletions(-)

diff --git a/features/install.feature b/features/install.feature
index b576579..2de891d 100644
--- a/features/install.feature
+++ b/features/install.feature
@@ -179,9 +179,8 @@ Feature: cli/install
     And the file "modules/super/Puppetfile" should match /mod *'sub'/
     And the file "Puppetfile.lock" should match /remote: git:..github\.com.mpalmer.puppet-sub/
 
-  @pending
   Scenario: Install a module with conflicts
-    Given PENDING a file named "Puppetfile" with:
+    Given a file named "Puppetfile" with:
     """
     forge "http://forge.puppetlabs.com"
 
diff --git a/features/update.feature b/features/update.feature
index 339dee5..9133073 100644
--- a/features/update.feature
+++ b/features/update.feature
@@ -60,9 +60,8 @@ Feature: cli/update
     And the file "modules/apache/Modulefile" should match /name *'puppetlabs-apache'/
     And the file "modules/apache/Modulefile" should match /version *'0\.5\.0-rc1'/
 
-  @pending
   Scenario: Updating a module that is not in the Puppetfile
-    Given PENDING a file named "Puppetfile" with:
+    Given a file named "Puppetfile" with:
     """
     forge "http://forge.puppetlabs.com"
 

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-ruby-extras/librarian-puppet.git