From 85d5e37cc96cb6dc9677b3546abcd0611bf60810 Mon Sep 17 00:00:00 2001 From: Azul Date: Sun, 14 Jul 2013 14:00:44 +0200 Subject: more fixtures --- test/session_test.rb | 7 ------- 1 file changed, 7 deletions(-) (limited to 'test/session_test.rb') diff --git a/test/session_test.rb b/test/session_test.rb index dc97077..ff3f4f3 100644 --- a/test/session_test.rb +++ b/test/session_test.rb @@ -38,13 +38,6 @@ class SessionTest < Test::Unit::TestCase assert_equal client, session.authenticate(data[:m].hex) end - def fixture(filename) - path = File.expand_path("../fixtures/#{filename}.json", __FILE__) - HashWithIndifferentAccess[JSON.parse(File.read(path))] - end - - - def stub_client(data) @username = data[:username] @password = data[:password] -- cgit v1.2.3 From d508b7eb1f372f8c8175cc16e7669435d1fe995f Mon Sep 17 00:00:00 2001 From: Azul Date: Sun, 14 Jul 2013 14:01:04 +0200 Subject: first take on a hex based api --- test/session_test.rb | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) (limited to 'test/session_test.rb') diff --git a/test/session_test.rb b/test/session_test.rb index ff3f4f3..41d66b3 100644 --- a/test/session_test.rb +++ b/test/session_test.rb @@ -11,7 +11,7 @@ class SessionTest < Test::Unit::TestCase session = init_session(client, data) assert_same_values(data, session.internal_state) - assert_equal client, session.authenticate(data[:m].hex) + assert_equal client, session.authenticate(data[:m]) assert_equal({:M2 => data[:m2]}, session.to_hash) assert_equal({'M2' => data[:m2]}.to_json, session.to_json) end @@ -26,7 +26,7 @@ class SessionTest < Test::Unit::TestCase state.delete(:salt) assert_same_values(data, state) - assert_equal client, session.authenticate(data[:m].hex) + assert_equal client, session.authenticate(data[:m]) end def test_failing_js_login @@ -35,7 +35,7 @@ class SessionTest < Test::Unit::TestCase session = init_session(client, data) assert_same_values(data, session.internal_state) - assert_equal client, session.authenticate(data[:m].hex) + assert_equal client, session.authenticate(data[:m]) end def stub_client(data) @@ -50,11 +50,11 @@ class SessionTest < Test::Unit::TestCase end def init_session(client, data) - aa = data[:aa].hex + aa = data[:aa] b = data[:b].hex session = SRP::Session.new(client, aa) # seed b to compare to py_srp - session.send(:initialize_server, aa, b) + session.send(:initialize_server, aa.hex, b) session end -- cgit v1.2.3 From e4a577e45f36b3ed93d85fc466ae13217cca955c Mon Sep 17 00:00:00 2001 From: Azul Date: Sun, 14 Jul 2013 14:22:31 +0200 Subject: store aa, bb and u as hex by default --- test/session_test.rb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'test/session_test.rb') diff --git a/test/session_test.rb b/test/session_test.rb index 41d66b3..6864de7 100644 --- a/test/session_test.rb +++ b/test/session_test.rb @@ -54,7 +54,7 @@ class SessionTest < Test::Unit::TestCase b = data[:b].hex session = SRP::Session.new(client, aa) # seed b to compare to py_srp - session.send(:initialize_server, aa.hex, b) + session.send(:initialize_server, aa, b) session end -- cgit v1.2.3