Skip to content

Commit

Permalink
Merge branch 'master' of github.com:xhochy/scrobbler
Browse files Browse the repository at this point in the history
  • Loading branch information
xhochy committed Sep 18, 2010
2 parents afbce62 + c8dfbaf commit ff401cf
Show file tree
Hide file tree
Showing 12 changed files with 13 additions and 13 deletions.
2 changes: 1 addition & 1 deletion test/unit/album_spec.rb
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
require File.dirname(__FILE__) + '/../spec_helper.rb'
require File.expand_path(File.dirname(__FILE__) + '/../spec_helper.rb')

describe Scrobbler::Album do

Expand Down
2 changes: 1 addition & 1 deletion test/unit/artist_spec.rb
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
# encoding: utf-8

require File.dirname(__FILE__) + '/../spec_helper.rb'
require File.expand_path(File.dirname(__FILE__) + '/../spec_helper.rb')

describe Scrobbler::Artist do

Expand Down
2 changes: 1 addition & 1 deletion test/unit/authentication_spec.rb
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
require File.dirname(__FILE__) + '/../spec_helper.rb'
require File.expand_path(File.dirname(__FILE__) + '/../spec_helper.rb')

describe Scrobbler::Authentication do

Expand Down
2 changes: 1 addition & 1 deletion test/unit/event_spec.rb
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
require File.dirname(__FILE__) + '/../spec_helper.rb'
require File.expand_path(File.dirname(__FILE__) + '/../spec_helper.rb')

describe Scrobbler::Event do

Expand Down
4 changes: 2 additions & 2 deletions test/unit/geo_spec.rb
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
require File.dirname(__FILE__) + '/../spec_helper.rb'
require File.expand_path(File.dirname(__FILE__) + '/../spec_helper.rb')

describe Scrobbler::Geo do

Expand Down Expand Up @@ -145,4 +145,4 @@
end
end
end
end
end
2 changes: 1 addition & 1 deletion test/unit/library_spec.rb
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
require File.dirname(__FILE__) + '/../spec_helper.rb'
require File.expand_path(File.dirname(__FILE__) + '/../spec_helper.rb')

describe Scrobbler::Library do

Expand Down
2 changes: 1 addition & 1 deletion test/unit/playlist_spec.rb
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
require File.dirname(__FILE__) + '/../spec_helper.rb'
require File.expand_path(File.dirname(__FILE__) + '/../spec_helper.rb')

describe Scrobbler::Playlist do

Expand Down
2 changes: 1 addition & 1 deletion test/unit/radio_spec.rb
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
require File.dirname(__FILE__) + '/../spec_helper.rb'
require File.expand_path(File.dirname(__FILE__) + '/../spec_helper.rb')

describe Scrobbler::Radio do

Expand Down
2 changes: 1 addition & 1 deletion test/unit/tag_spec.rb
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
# encoding: utf-8

require File.dirname(__FILE__) + '/../spec_helper.rb'
require File.expand_path(File.dirname(__FILE__) + '/../spec_helper.rb')

describe Scrobbler::Tag do

Expand Down
2 changes: 1 addition & 1 deletion test/unit/track_spec.rb
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
require File.dirname(__FILE__) + '/../spec_helper.rb'
require File.expand_path(File.dirname(__FILE__) + '/../spec_helper.rb')

describe Scrobbler::Track do

Expand Down
2 changes: 1 addition & 1 deletion test/unit/user_spec.rb
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
require File.dirname(__FILE__) + '/../spec_helper.rb'
require File.expand_path(File.dirname(__FILE__) + '/../spec_helper.rb')

describe Scrobbler::User do

Expand Down
2 changes: 1 addition & 1 deletion test/unit/venue_spec.rb
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
require File.dirname(__FILE__) + '/../spec_helper.rb'
require File.expand_path(File.dirname(__FILE__) + '/../spec_helper.rb')

describe Scrobbler::Venue do
before do
Expand Down

0 comments on commit ff401cf

Please sign in to comment.