@@ -1,8 +1,8 @@ -ERL_TOP="/opt/lib/otp_R12B-5" +ERL_TOP="/usr/local/lib/erlang_R13-B0" USE_EMAKE = true EMAKE_COMPILE_OPTIONS = ["{d, 'HOST', \"localhost\"}", "{d, 'PORT', 4444}", - "{d, 'COMMAND', \"*firefox\ /usr/lib/firefox-3.0.6/firefox\"}"] + "{d, 'COMMAND', \"*safari\"}"] ERLC_FLAGS = "+warn_unused_vars +warn_unused_import" ERL_FLAGS = "-sname test" erlang_config.rb @@ -89,9 +89,8 @@ cmd(Session, Command, Params, Fun) when is_list(Params) -> launch_command_session(Config) -> Config_value = dict:from_list(Config), {ok, {Host, Port}} = dict:find(server, Config_value), - {ok, {Browser, Browser_binary}} = dict:find(browser, Config_value), + {ok, Browser_command} = dict:find(browser, Config_value), {ok, URL} = dict:find(url, Config_value), - Browser_command = Browser ++ " " ++ Browser_binary, selenium:start(Host, Port, Browser_command, URL). run_command(Session, {Key, Params}) -> lib/selenium_remote/src/selenium.erl @@ -149,13 +149,13 @@ keypress_test () -> Ajax_url = "http://localhost:4444/selenium-server/tests/html/ajax/ajax_autocompleter2_test.html", selenium: cmd (Session, open, [Ajax_url]), selenium: cmd (Session, keyPress, [InputId, "74"]), - receive after 500 -> ok end, + receive after 5000 -> ok end, selenium: cmd (Session, keyPress, [InputId, "97"]), selenium: cmd (Session, keyPress, [InputId, "110"]), - receive after 500 -> ok end, + receive after 5000 -> ok end, {ok, "Jane Agnews"} = selenium: cmd (Session, getText, [UpdateId]), selenium: cmd (Session, keyPress, [InputId, "13"]), - receive after 500 -> ok end, + receive after 5000 -> ok end, {ok, "Jane Agnews"} = selenium: cmd (Session, getValue, [InputId]) catch E:R -> exit ({E,R,erlang:get_stacktrace ()}) @@ -229,8 +229,8 @@ i18n_test () -> Test = fun({Id,Data}) -> UTF8 = xmerl_ucs:to_utf8(Data), Result = selenium: cmd (Session, isTextPresent, [UTF8]), - {ok, "true"} = Result, - {ok, UTF8} = selenium: cmd(Session, getText, [Id]) + {is_text_present, {ok, "true"}} = {is_text_present, Result}, + {get_text, {ok, UTF8}} = {get_text, selenium: cmd(Session, getText, [Id])} end, lists:foreach(Test, Datas) catch E:R -> @@ -277,9 +277,8 @@ wait_for_page_to_load () -> selenium_config () -> URL = "http://localhost:4444", - BrowserBinary = "/usr/lib/firefox-3.0.6/firefox", [{server, {?HOST, ?PORT}}, - {browser, {"*firefox", BrowserBinary}}, + {browser, ?COMMAND}, {url, URL}]. lib/selenium_remote/test/selenium_tests.erl @@ -1,4 +1,5 @@ -{inparallel, 2, [{timeout, 60, {selenium_tests, command_to_string_test}}, +{inparallel, 1, [ + {timeout, 60, {selenium_tests, command_to_string_test}}, {timeout, 60, {selenium_tests, build_request_without_id_test}}, {timeout, 60, {selenium_tests, build_request_test}}, {timeout, 60, {selenium_tests, parse_body_test}}, @@ -23,4 +24,5 @@ {timeout, 60, {selenium_session_tests, utf8_test}}, {timeout, 60, {selenium_session_tests, type_very_long_text_test}}, {timeout, 60, {selenium_session_tests, keypress_test}}, - {timeout, 60, {selenium_session_tests, google_test}}]}. + {timeout, 60, {selenium_session_tests, google_test}} +]}. lib/selenium_remote/test/test.desc @@ -11,14 +11,14 @@ status() { } rake start_server 1> /dev/null 2>&1 -echo -n "Validate with OTP R11B-5 : " -sed -i -e "s,ERL_TOP.*,ERL_TOP=\"/opt/lib/otp_R11B-5\"," erlang_config.rb -rake clean 2> /dev/null -rake tests 1> /tmp/selenium_validation_R11.log 2>&1 -status $? echo -n "Validate with OTP R12B-5 : " -sed -i -e "s,ERL_TOP.*,ERL_TOP=\"/opt/lib/otp_R12B-5\"," erlang_config.rb +sed -i -e "s,ERL_TOP.*,ERL_TOP=\"/usr/local/lib/erlang_R12-B5\"," erlang_config.rb rake clean 2> /dev/null rake tests 1> /tmp/selenium_validation_R12.log 2>&1 status $? -make stop_server 1> /dev/null 2>&1 +echo -n "Validate with OTP R13B-0 : " +sed -i -e "s,ERL_TOP.*,ERL_TOP=\"/usr/local/lib/erlang_R13-B0\"," erlang_config.rb +rake clean 2> /dev/null +rake tests 1> /tmp/selenium_validation_R13.log 2>&1 +status $? +rake stop_server 1> /dev/null 2>&1 validate.sh b081c0000ea5ba2f79f5ecc8ad95901d61a21d49 charpi charpi@3ab005ec-33ed-11dd-9e78-a92e4af85449 http://github.com/charpi/erl_selenium/commit/0690b4f3ec438fb104b606b24d45ee81de142239 0690b4f3ec438fb104b606b24d45ee81de142239 2009-05-23T03:41:09-07:00 2009-05-23T03:41:09-07:00 R13 integration and test on safari a7f130a65e0ee0325096437ae11daf88184f6275 charpi charpi@3ab005ec-33ed-11dd-9e78-a92e4af85449