Skip to content

Commit

Permalink
Merge remote-tracking branch 'upstream/master' into fix-firefox
Browse files Browse the repository at this point in the history
  • Loading branch information
korny committed Jun 3, 2013
2 parents 5a9f83c + 4511082 commit be3507b
Showing 1 changed file with 2 additions and 2 deletions.
4 changes: 2 additions & 2 deletions test/test_helper.rb
Original file line number Diff line number Diff line change
Expand Up @@ -8,10 +8,10 @@
require 'tubesock'
require 'json'

class Tubesock::TestCase < MiniTest::Unit::TestCase
class Tubesock::TestCase < Minitest::Unit::TestCase
end

# Abstrack away frames and sockets so that
# Abstract away frames and sockets so that
# tests can focus on message interaction
class Tubesock::TestCase::TestInteraction
def initialize
Expand Down

0 comments on commit be3507b

Please sign in to comment.