From 7e31241f2162c650f9aaf2f7bd9efd8a16a85793 Mon Sep 17 00:00:00 2001
From: everzet <ever.zet@gmail.com>
Date: Tue, 8 May 2012 13:29:01 +0200
Subject: [PATCH] remove trailing separator in files_path before applying

---
 src/Behat/MinkExtension/Context/MinkContext.php    | 2 +-
 src/Behat/MinkExtension/Context/MinkDictionary.php | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/Behat/MinkExtension/Context/MinkContext.php b/src/Behat/MinkExtension/Context/MinkContext.php
index 3f871a6..269e3a4 100644
--- a/src/Behat/MinkExtension/Context/MinkContext.php
+++ b/src/Behat/MinkExtension/Context/MinkContext.php
@@ -192,7 +192,7 @@ class MinkContext extends RawMinkContext implements TranslatedContextInterface
         $field = $this->fixStepArgument($field);
 
         if ($this->getMinkParameter('files_path')) {
-            $path = $this->getMinkParameter('files_path').DIRECTORY_SEPARATOR.$path;
+            $path = rtrim($this->getMinkParameter('files_path'), DIRECTORY_SEPARATOR).DIRECTORY_SEPARATOR.$path;
         }
 
         $this->getSession()->getPage()->attachFileToField($field, $path);
diff --git a/src/Behat/MinkExtension/Context/MinkDictionary.php b/src/Behat/MinkExtension/Context/MinkDictionary.php
index 971d25e..4152a3f 100644
--- a/src/Behat/MinkExtension/Context/MinkDictionary.php
+++ b/src/Behat/MinkExtension/Context/MinkDictionary.php
@@ -262,7 +262,7 @@ trait MinkDictionary
         $field = $this->fixStepArgument($field);
 
         if ($this->getMinkParameter('files_path')) {
-            $path = $this->getMinkParameter('files_path').DIRECTORY_SEPARATOR.$path;
+            $path = rtrim($this->getMinkParameter('files_path'), DIRECTORY_SEPARATOR).DIRECTORY_SEPARATOR.$path;
         }
 
         $this->getSession()->getPage()->attachFileToField($field, $path);