Style fixes and better tests.

Author: suprnova32

lib/gitlab_lfs_authentication.rb

@@ -11,11 +11,11 @@ def initialize(username, lfs_token, repository_http_path)
  end
 
  def self.build_from_json(json)
- values = JSON.parse(json)
+ values = JSON.parse(json) rescue nil
  self.new(values['username'], values['lfs_token'], values['repository_http_path'])
  end
 
- def authenticate!
+ def authentication_payload
  authorization = {
  header: {
  Authorization: "Basic #{Base64.strict_encode64("#{username}:#{lfs_token}")}"

lib/gitlab_shell.rb

@@ -194,7 +194,7 @@ def lfs_authenticate
 
  return unless lfs_access
 
- puts lfs_access.authenticate!
+ puts lfs_access.authentication_payload
  end
 
  private

spec/gitlab_lfs_authentication_spec.rb

@@ -1,22 +1,37 @@
 require 'spec_helper'
 require 'gitlab_lfs_authentication'
+require 'json'
 
 describe GitlabLfsAuthentication do
- let(:user) { { 'username' => 'dzaporozhets', 'lfs_token' => 'wsnys8Zm8Jn7zyhHTAAK' } }
-
  subject do
- GitlabLfsAuthentication.new('dzaporozhets', 'wsnys8Zm8Jn7zyhHTAAK', 'http://gitlab.dev/repo')
+ GitlabLfsAuthentication.build_from_json(
+ JSON.generate(
+ {
+ username: 'dzaporozhets',
+ lfs_token: 'wsnys8Zm8Jn7zyhHTAAK',
+ repository_http_path: 'http://gitlab.dev/repo'
+ }
+ )
+ )
  end
 
- describe '#initialize' do
+ describe '#build_from_json' do
  it { subject.username.should == 'dzaporozhets' }
  it { subject.lfs_token.should == 'wsnys8Zm8Jn7zyhHTAAK' }
  it { subject.repository_http_path.should == 'http://gitlab.dev/repo' }
  end
 
- describe '#authenticate!' do
+ describe '#authentication_payload' do
  result = "{\"header\":{\"Authorization\":\"Basic ZHphcG9yb3poZXRzOndzbnlzOFptOEpuN3p5aEhUQUFL\"},\"href\":\"http://gitlab.dev/repo/info/lfs/\"}"
 
- it { subject.authenticate!.should == result }
+ it { subject.authentication_payload.should eq(result) }
+
+ it 'should be a proper JSON' do
+ payload = subject.authentication_payload
+ json_payload = JSON.parse(payload)
+
+ json_payload['header']['Authorization'].should eq('Basic ZHphcG9yb3poZXRzOndzbnlzOFptOEpuN3p5aEhUQUFL')
+ json_payload['href'].should eq('http://gitlab.dev/repo/info/lfs/')
+ end
  end
 end

spec/gitlab_shell_spec.rb

@@ -135,7 +135,7 @@
  end
 
  its(:repo_name) { should == 'dzaporozhets/gitlab.git' }
- its(:git_cmd) { should == 'git-lfs-authenticate' }
+ its(:command) { should == 'git-lfs-authenticate' }
  its(:git_access) { should == 'git-upload-pack' }
  end
  end