Merge remote-tracking branch 'remotes/dev/release'

oroinc · Apr 1, 2014 · 98781ef · 98781ef
2 parents 60d71bd + 6346e38
commit 98781ef
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 1 deletion.
diff --git a/composer.json b/composer.json
@@ -14,6 +14,12 @@
             "OroCRM\\Bundle": "src/"
          }
     },
+    "repositories": [
+       {
+            "type": "composer",
+            "url": "http://packagist.orocrm.com"
+        }
+    ],
     "require": {
         "php": ">=5.4.4",
         "oro/platform": "1.0.0"

diff --git a/src/OroCRM/Bundle/TestFrameworkBundle/Tests/Selenium/Tags/TagsAssignTest.php b/src/OroCRM/Bundle/TestFrameworkBundle/Tests/Selenium/Tags/TagsAssignTest.php
@@ -106,7 +106,7 @@ public function testUserTag($tagName)
             ->setFirstName('First_'.$userName)
             ->setLastName('Last_'.$userName)
             ->setEmail($userName.'@mail.com')
-            ->setRoles(array('Manager', 'Marketing manager'), true)
+            ->setRoles(array('Manager', 'Marketing Manager'), true)
             ->uncheckInviteUser()
             ->verifyTag($tagName)
             ->setTag('New_' . $tagName)