Merge remote-tracking branch 'origin/develop'

Conflicts:
	app/assets/javascripts/srp
	test/nagios/soledad_sync.py
	test/nagios/webapp_login.py

2 files changed, 73 insertions, 0 deletions

diff --git a/engines/support/test/integration/create_ticket_test.rb b/engines/support/test/integration/create_ticket_test.rb
new file mode 100644
index 0000000..0f8453c
--- /dev/null
+++ b/engines/support/test/integration/create_ticket_test.rb
@@ -0,0 +1,64 @@
+require 'test_helper'
+
+class CreateTicketTest < BrowserIntegrationTest
+
+  test "can submit ticket anonymously" do
+    visit '/'
+    click_on 'Get Help'
+    fill_in 'Subject', with: 'test ticket'
+    fill_in 'Description', with: 'description of the problem goes here'
+    click_on 'Create Ticket'
+    assert page.has_content?("Ticket was successfully created.")
+    assert page.has_content?("You can later access this ticket at the URL")
+    assert page.has_content?(current_url)
+    assert ticket = Ticket.last
+    ticket.destroy
+  end
+
+  test "get help when creating ticket with invalid email" do
+    visit '/'
+    click_on 'Get Help'
+    fill_in 'Subject', with: 'test ticket'
+    fill_in 'Email', with: 'invalid data'
+    fill_in 'Regarding user', with: 'some user'
+    fill_in 'Description', with: 'description of the problem goes here'
+    click_on 'Create Ticket'
+    assert page.has_content?("is invalid")
+    assert_equal 'invalid data', find_field('Email').value
+    assert_equal 'some user', find_field('Regarding user').value
+  end
+
+  test "prefills fields" do
+    login FactoryGirl.create(:premium_user)
+    visit '/'
+    click_on "Support Tickets"
+    click_on "New Ticket"
+    email = "#{@user.login}@#{APP_CONFIG[:domain]}"
+    assert_equal email, find_field('Email').value
+    assert_equal @user.login, find_field('Regarding user').value
+  end
+
+  test "no prefill of email without email service" do
+    login
+    visit '/'
+    click_on "Support Tickets"
+    click_on "New Ticket"
+    assert_equal "", find_field('Email').value
+    assert_equal @user.login, find_field('Regarding user').value
+  end
+
+  test "cleared email field should remain clear" do
+    login FactoryGirl.create(:premium_user)
+    visit '/'
+    click_on "Support Tickets"
+    click_on "New Ticket"
+    fill_in 'Subject', with: 'test ticket'
+    fill_in 'Email', with: ''
+    fill_in 'Description', with: 'description of the problem goes here'
+    click_on 'Create Ticket'
+    ticket = Ticket.last
+    assert_equal "", ticket.email
+    ticket.destroy
+  end
+
+end
diff --git a/engines/support/test/integration/navigation_test.rb b/engines/support/test/integration/navigation_test.rb
new file mode 100644
index 0000000..eec8c0e
--- /dev/null
+++ b/engines/support/test/integration/navigation_test.rb
@@ -0,0 +1,9 @@
+require 'test_helper'
+
+class NavigationTest < ActionDispatch::IntegrationTest
+
+  # test "the truth" do
+  #   assert true
+  # end
+end
+