Added account name to enforcer

Signed-off-by: Nick Quaranto <nick@quaran.to>

features/manage_collaborators.feature

@@ -1,17 +1,19 @@
 Feature: Manage collaborators
+  Background:
+    Given an account "thoughtbot"
 
   Scenario: Adding a single collaborator for a specific project
-   Given the following collaborators for "shoulda"
-    |name      |
-    |thoughtbot|
-   Given I am adding "rmmt" as a collaborator to "shoulda"
-    """
-    Enforcer "thoughtbot" do
-      project "shoulda" do
-        collaborators 'rmmt'
-      end
-    end
-    """
-    When I execute it
-    Then the GitHub API should have received a request to add a "rmmt" as a collaborator for "shoulda"
+    Given the following collaborators for "shoulda"
+     |name      |
+     |thoughtbot|
+    Given I am adding "rmmt" as a collaborator to "shoulda"
+     """
+     Enforcer "thoughtbot" do
+       project "shoulda" do
+         collaborators 'rmmt'
+       end
+     end
+     """
+     When I execute it
+     Then the GitHub API should have received a request to add a "rmmt" as a collaborator for "shoulda"
 

features/step_definitions/enforcer_steps.rb

@@ -1,10 +1,13 @@
+Given /^an account "(.*)"$/ do |account|
+  @account = account
+end
+
 Given /^I am adding "(.*)" as a collaborator to "(.*)"$/ do |user, repo, code|
   @names << user
   @names_list = @names.join('", "')
   @collaborators = '{"collaborators: + ["' + @names_list + '"]}'
 
-  mock(GitHubApi).add_collaborator(repo, user)
-#  FakeWeb.register_uri(:post, "http://github.com/api/v2/json/repos/collaborators/#{@repo}/#{@user}", :string => @collaborators)
+  mock(GitHubApi).add_collaborator(@account, repo, user)
   @code = code
 end
 
@@ -20,6 +23,6 @@
 end
 
 Then /^the GitHub API should have received a request to add a "(.*)" as a collaborator for "(.*)"$/ do |user, repo|
-  assert_received(GitHubApi) { |subject| subject.add_collaborator(repo, user) }
+  assert_received(GitHubApi) { |subject| subject.add_collaborator(@account, repo, user) }
 end
 

lib/enforcer.rb

@@ -2,15 +2,16 @@
 require 'github_api'
 
 class Enforcer
-  def initialize(user_name)
+  def initialize(account_name)
+    @account_name = account_name
   end
 
   def project(project_name, &block)
     instance_eval(&block)
     return if @collaborators.nil?
 
     @collaborators.each do |collaborator|
-      GitHubApi.add_collaborator(project_name, collaborator)
+      GitHubApi.add_collaborator(@account_name, project_name, collaborator)
     end
   end
 
@@ -19,7 +20,7 @@ def collaborators(*names)
   end
 end
 
-def Enforcer(user_name, &block)
-   enforcer = Enforcer.new(user_name)
-   enforcer.instance_eval(&block)
+def Enforcer(account_name, &block)
+  enforcer = Enforcer.new(account_name)
+  enforcer.instance_eval(&block)
 end

test/enforcer_test.rb

@@ -3,22 +3,18 @@
 class EnforcerTest < Test::Unit::TestCase
   context "with an enforcer" do
     setup do
-      stub(GitHubApi).add_collaborator(anything, anything)
+      stub(GitHubApi).add_collaborator(anything, anything, anything)
       @username = "user"
       @enforcer = Enforcer.new(@username)
     end
 
-    #should "store username" do
-      #assert_equal @username, @enforcer.username
-    #end
-
-    should "adds the collaborators to the project" do
+    should "add collaborators to the project" do
       @enforcer.project 'foo' do
         collaborators 'chaines'
       end
 
       assert_received(GitHubApi) do |subject|
-        subject.add_collaborator('foo', 'chaines')
+        subject.add_collaborator(@username, 'foo', 'chaines')
       end
     end
   end