diff --git a/spec/features/fluentd/setting/out_elasticsearch_spec.rb b/spec/features/fluentd/setting/out_elasticsearch_spec.rb index 9d967dc..66fa497 100644 --- a/spec/features/fluentd/setting/out_elasticsearch_spec.rb +++ b/spec/features/fluentd/setting/out_elasticsearch_spec.rb @@ -11,12 +11,7 @@ describe "out_elasticsearch" do Fluentd::Agent::TdAgent.any_instance.stub(:detached_command).and_return(true) daemon.agent.config_write "" - visit '/sessions/new' - within("form") do - fill_in 'session_name', :with => exists_user.name - fill_in 'session_password', :with => exists_user.password - end - click_button I18n.t("terms.sign_in") + login_with exists_user end it "Shown form" do diff --git a/spec/features/fluentd/setting/out_forward_spec.rb b/spec/features/fluentd/setting/out_forward_spec.rb index 9e1dd99..bc776b8 100644 --- a/spec/features/fluentd/setting/out_forward_spec.rb +++ b/spec/features/fluentd/setting/out_forward_spec.rb @@ -9,13 +9,8 @@ describe "out_forward" do Fluentd.stub(:instance).and_return(daemon) Fluentd::Agent::TdAgent.any_instance.stub(:detached_command).and_return(true) daemon.agent.config_write "" - - visit '/sessions/new' - within("form") do - fill_in 'session_name', :with => exists_user.name - fill_in 'session_password', :with => exists_user.password - end - click_button I18n.t("terms.sign_in") + + login_with exists_user end it "Shown form" do diff --git a/spec/features/fluentd/setting/out_td_spec.rb b/spec/features/fluentd/setting/out_td_spec.rb index 57ce91f..efad9f4 100644 --- a/spec/features/fluentd/setting/out_td_spec.rb +++ b/spec/features/fluentd/setting/out_td_spec.rb @@ -9,13 +9,8 @@ describe "out_td" do Fluentd.stub(:instance).and_return(daemon) Fluentd::Agent::TdAgent.any_instance.stub(:detached_command).and_return(true) daemon.agent.config_write "" - - visit '/sessions/new' - within("form") do - fill_in 'session_name', :with => exists_user.name - fill_in 'session_password', :with => exists_user.password - end - click_button I18n.t("terms.sign_in") + + login_with exists_user end it "Shown form with filled in td.*.* on match" do diff --git a/spec/features/fluentd/setting/source_and_output_spec.rb b/spec/features/fluentd/setting/source_and_output_spec.rb index 089cded..5bb04f9 100644 --- a/spec/features/fluentd/setting/source_and_output_spec.rb +++ b/spec/features/fluentd/setting/source_and_output_spec.rb @@ -7,15 +7,8 @@ describe "source_and_output", js: true do before do Fluentd.stub(:instance).and_return(daemon) Fluentd::Agent::TdAgent.any_instance.stub(:detached_command).and_return(true) - end - before do - visit '/sessions/new' - within("form") do - fill_in 'session_name', :with => exists_user.name - fill_in 'session_password', :with => exists_user.password - end - click_button I18n.t("terms.sign_in") + login_with exists_user end before do diff --git a/spec/features/sessions_spec.rb b/spec/features/sessions_spec.rb index 4ccbc47..92f8e61 100644 --- a/spec/features/sessions_spec.rb +++ b/spec/features/sessions_spec.rb @@ -5,12 +5,7 @@ describe "sessions" do describe "sign in with default password" do before do - visit '/sessions/new' - within("form") do - fill_in 'session_name', :with => user.name - fill_in 'session_password', :with => user.password - end - click_button submit_label + login_with user end context "correct credentials" do @@ -40,12 +35,8 @@ describe "sessions" do before do exists_user.update_attributes(current_password: Settings.default_password, password: new_password, password_confirmation: new_password) - visit '/sessions/new' - within("form") do - fill_in 'session_name', :with => user.name - fill_in 'session_password', :with => user.password - end - click_button submit_label + + login_with user end after do @@ -71,12 +62,7 @@ describe "sessions" do describe "sign out process" do let(:submit_label) { I18n.t("terms.sign_in") } before do - visit '/sessions/new' - within("form") do - fill_in 'session_name', :with => exists_user.name - fill_in 'session_password', :with => exists_user.password - end - click_button submit_label + login_with exists_user end before do