Use get_next_match from yarnutils

1 files changed, 35 insertions, 35 deletions

diff --git a/000.yarn b/000.yarn
index a313ae7..555b4fd 100644
--- a/000.yarn
+++ b/000.yarn
@@ -267,7 +267,7 @@ WHEN admin creates user
 -----------------------------------------------------------------------------
 
     IMPLEMENTS WHEN admin creates user (\S+)
-    username = helper.get_next_match()
+    username = get_next_match()
     # FIXME: Create first, this is temporary
     helper.append_to_list('users', username)
     helper.gitano(
@@ -282,7 +282,7 @@ WHEN admin creates group
 -----------------------------------------------------------------------------
 
     IMPLEMENTS WHEN admin creates group (\S+)
-    group = helper.get_next_match()
+    group = get_next_match()
     # FIXME: Create first, this is temporary
     helper.append_to_list('groups', group)
     helper.gitano(None, 'group add {} Test group'.format(group))
@@ -291,8 +291,8 @@ WHEN admin adds user to group
 -----------------------------------------------------------------------------
 
     IMPLEMENTS WHEN admin adds (\S+) to (\S+)
-    user = helper.get_next_match()
-    group = helper.get_next_match()
+    user = get_next_match()
+    group = get_next_match()
     output = helper.gitano(
         None, 'group adduser {} {}'.format(group, user))
 
@@ -300,7 +300,7 @@ WHEN admin created repository
 -----------------------------------------------------------------------------
 
     IMPLEMENTS WHEN admin creates repository (\S+)
-    repo = helper.get_next_match()
+    repo = get_next_match()
     # FIXME: Create first, this is temporary
     helper.append_to_list('repositories', repo)
     helper.gitano(None, 'create {}'.format(repo))
@@ -322,17 +322,17 @@ WHEN admin sets repository config
 -----------------------------------------------------------------------------
 
     IMPLEMENTS WHEN admin sets (\S+) config (\S+) to (\S+)
-    repo = helper.get_next_match()
-    key = helper.get_next_match()
-    value = helper.get_next_match()
+    repo = get_next_match()
+    key = get_next_match()
+    value = get_next_match()
     helper.gitano(None, 'config {} set {} {}'.format(repo, key, value))
 
 THEN a user can clone a repository
 -----------------------------------------------------------------------------
 
     IMPLEMENTS THEN (\S+) can clone (\S+)
-    user = helper.get_next_match()
-    repo = helper.get_next_match()
+    user = get_next_match()
+    repo = get_next_match()
     url = helper.repo_ssh_url(repo)
     dirname = helper.local_checkout_dirname(user, repo)
     helper.git_as_checked(user, ['clone', url, dirname])
@@ -343,8 +343,8 @@ THEN a user can't clone a repository
 -----------------------------------------------------------------------------
 
     IMPLEMENTS THEN (\S+) cannot clone (\S+)
-    user = helper.get_next_match()
-    repo = helper.get_next_match()
+    user = get_next_match()
+    repo = get_next_match()
     url = helper.repo_ssh_url(repo)
     dirname = helper.local_checkout_dirname(user, repo)
     exit, out, err = helper.git_as(user, ['clone', url, dirname])
@@ -354,7 +354,7 @@ THEN a repository can be cloned over the git protocol
 -----------------------------------------------------------------------------
 
     IMPLEMENTS THEN we can clone (\S+) via the git protocol
-    repo = helper.get_next_match()
+    repo = get_next_match()
     server = os.environ['GITANO_SERVER']
     url = 'git://{}/{}'.format(server, repo)
     dirname = helper.local_checkout_dirname('anonymous', repo)
@@ -364,9 +364,9 @@ WHEN a user creates a local branch
 -----------------------------------------------------------------------------
 
     IMPLEMENTS WHEN (\S+) creates (\S+) branch (\S+)
-    user = helper.get_next_match()
-    repo = helper.get_next_match()
-    branch = helper.get_next_match()
+    user = get_next_match()
+    repo = get_next_match()
+    branch = get_next_match()
     dirname = helper.local_checkout_dirname(user, repo)
     cliapp.runcmd(['git', 'checkout', '-b', branch], cwd=dirname)
 
@@ -374,9 +374,9 @@ WHEN a user changes a branch locally
 -----------------------------------------------------------------------------
 
     IMPLEMENTS WHEN (\S+) changes (\S+) branch (\S+)
-    user = helper.get_next_match()
-    repo = helper.get_next_match()
-    branch = helper.get_next_match()
+    user = get_next_match()
+    repo = get_next_match()
+    branch = get_next_match()
     dirname = helper.local_checkout_dirname(user, repo)
     with open(os.path.join(dirname, 'foo.txt'), 'a') as f:
         f.write('foo\n')
@@ -387,8 +387,8 @@ THEN a user can push all local branches
 -----------------------------------------------------------------------------
 
     IMPLEMENTS THEN (\S+) can push (\S+)
-    user = helper.get_next_match()
-    repo = helper.get_next_match()
+    user = get_next_match()
+    repo = get_next_match()
     url = helper.repo_ssh_url(repo)
     dirname = helper.local_checkout_dirname(user, repo)
     helper.git_as_checked(user, ['push', '--all', 'origin'], cwd=dirname)
@@ -397,8 +397,8 @@ THEN a user can push all local tags
 -----------------------------------------------------------------------------
 
     IMPLEMENTS THEN (\S+) can push (\S+) with tags
-    user = helper.get_next_match()
-    repo = helper.get_next_match()
+    user = get_next_match()
+    repo = get_next_match()
     url = helper.repo_ssh_url(repo)
     dirname = helper.local_checkout_dirname(user, repo)
     helper.git_as_checked(user, ['push', '--tags', 'origin'], cwd=dirname)
@@ -407,8 +407,8 @@ THEN a user can't push local branches
 -----------------------------------------------------------------------------
 
     IMPLEMENTS THEN (\S+) cannot push (\S+)
-    user = helper.get_next_match()
-    repo = helper.get_next_match()
+    user = get_next_match()
+    repo = get_next_match()
     dirname = helper.local_checkout_dirname(user, repo)
     exit, out, err = helper.git_as(
         user,
@@ -421,8 +421,8 @@ THEN a user can't push local tags
 -----------------------------------------------------------------------------
 
     IMPLEMENTS THEN (\S+) cannot push (\S+) with tags
-    user = helper.get_next_match()
-    repo = helper.get_next_match()
+    user = get_next_match()
+    repo = get_next_match()
     dirname = helper.local_checkout_dirname(user, repo)
     exit, out, err = helper.git_as(
         user,
@@ -433,10 +433,10 @@ WHEN a user merges a branch locally
 -----------------------------------------------------------------------------
 
     IMPLEMENTS WHEN (\S+) merges (\S+) branch (\S+) to (\S+)
-    user = helper.get_next_match()
-    repo = helper.get_next_match()
-    branch_from = helper.get_next_match()
-    branch_to = helper.get_next_match()
+    user = get_next_match()
+    repo = get_next_match()
+    branch_from = get_next_match()
+    branch_to = get_next_match()
     dirname = helper.local_checkout_dirname(user, repo)
     cliapp.runcmd(['git', 'checkout', branch_to], cwd=dirname)
     cliapp.runcmd(['git', 'merge', branch_from], cwd=dirname)
@@ -445,10 +445,10 @@ WHEN a user creates a local tag
 -----------------------------------------------------------------------------
 
     IMPLEMENTS WHEN (\S+) tags (\S+) (\S+) branch with (\S+)
-    user = helper.get_next_match()
-    repo = helper.get_next_match()
-    branch = helper.get_next_match()
-    tag = helper.get_next_match()
+    user = get_next_match()
+    repo = get_next_match()
+    branch = get_next_match()
+    tag = get_next_match()
     dirname = helper.local_checkout_dirname(user, repo)
     cliapp.runcmd(['git', 'tag', '-mrelease!', tag], cwd=dirname)