+
\ No newline at end of file
diff --git a/web/config/routes.rb b/web/config/routes.rb
index e72c9476b..b225e907f 100644
--- a/web/config/routes.rb
+++ b/web/config/routes.rb
@@ -98,6 +98,8 @@ SampleApp::Application.routes.draw do
# vanilla forums sso
match '/forums/sso', to: 'vanilla_forums#authenticate'
+ # admin-only page to control settings
+ match '/extras/settings', to: 'extras#settings'
scope '/corp' do
# about routes
diff --git a/web/public/maintenance.html b/web/public/maintenance.html
new file mode 100644
index 000000000..d0641191d
--- /dev/null
+++ b/web/public/maintenance.html
@@ -0,0 +1,296 @@
+
+
+
+
+
+
+
+
JamKazam | Site Maintenance
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
Play music together over the Internet as if in the same room
+
+
+
+
+
+
JamKazam is currently down for maintenance.
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/web/spec/features/reconnect_spec.rb b/web/spec/features/reconnect_spec.rb
index b3bd0d2d5..d7d5f11ae 100644
--- a/web/spec/features/reconnect_spec.rb
+++ b/web/spec/features/reconnect_spec.rb
@@ -8,6 +8,10 @@ describe "Reconnect", :js => true, :type => :feature, :capybara_feature => true
let(:user1) { FactoryGirl.create(:user) }
let(:user2) { FactoryGirl.create(:user) }
+ before(:all) do
+ User.delete_all
+ end
+
before(:each) do
emulate_client
end
diff --git a/web/spec/features/recording_landing_spec.rb b/web/spec/features/recording_landing_spec.rb
index e186f4c67..eeb426f72 100644
--- a/web/spec/features/recording_landing_spec.rb
+++ b/web/spec/features/recording_landing_spec.rb
@@ -12,12 +12,12 @@ describe "Landing", :js => true, :type => :feature, :capybara_feature => true do
before(:each) do
MusicSessionHistory.delete_all
+ sign_in_poltergeist(user)
end
let (:claimed_recording) { FactoryGirl.create(:claimed_recording) }
it "should render comments" do
- pending "weird error"
recording = ClaimedRecording.first
comment = "test comment"
@@ -31,10 +31,10 @@ describe "Landing", :js => true, :type => :feature, :capybara_feature => true do
# (1) Test a user creating a comment and ensure it displays.
# comment body
- find('div', text: comment)
+ find('div.comment-text', text: comment)
# timestamp
- find('div', text: timestamp)
+ find('div.comment-timestamp', text: timestamp)
# (2) Test a user visiting a landing page with an existing comment.
@@ -42,9 +42,9 @@ describe "Landing", :js => true, :type => :feature, :capybara_feature => true do
visit url
# comment body
- find('div', text: comment)
+ find('div.comment-text', text: comment)
# timestamp
- find('div', text: timestamp)
+ find('div.comment-timestamp', text: timestamp)
end
end
\ No newline at end of file
diff --git a/web/spec/features/session_landing_spec.rb b/web/spec/features/session_landing_spec.rb
index 6e776ff21..f9530b8c7 100644
--- a/web/spec/features/session_landing_spec.rb
+++ b/web/spec/features/session_landing_spec.rb
@@ -14,7 +14,6 @@ describe "Landing", :js => true, :type => :feature, :capybara_feature => true do
end
it "should render comments" do
- pending "weird error"
msh = MusicSessionHistory.first
comment = "test comment"
@@ -28,10 +27,10 @@ describe "Landing", :js => true, :type => :feature, :capybara_feature => true do
find('#btnPostComment').trigger(:click)
# comment body
- find('div', text: comment)
+ find('div.comment-text', text: comment)
# timestamp
- find('div', text: timestamp)
+ find('div.comment-timestamp', text: timestamp)
# (2) Test a user visiting a landing page with an existing comment.
@@ -39,9 +38,9 @@ describe "Landing", :js => true, :type => :feature, :capybara_feature => true do
visit url
# comment body
- find('div', text: comment)
+ find('div.comment-text', text: comment)
# timestamp
- find('div', text: timestamp)
+ find('div.comment-timestamp', text: timestamp)
end
end
\ No newline at end of file
diff --git a/web/spec/spec_helper.rb b/web/spec/spec_helper.rb
index 9b179b8b8..d3f3dccbe 100644
--- a/web/spec/spec_helper.rb
+++ b/web/spec/spec_helper.rb
@@ -1,3 +1,11 @@
+
+# temporary to debug failing tests on the build server
+def bputs(msg)
+ if ENV["BUILD_PUTS"] == "1"
+ puts msg
+ end
+end
+
require 'simplecov'
require 'rubygems'
#require 'spork'
@@ -7,18 +15,27 @@ require 'omniauth'
ENV["RAILS_ENV"] ||= 'test'
+bputs "before activerecord load"
require 'active_record'
require 'action_mailer'
require 'jam_db'
require "#{File.dirname(__FILE__)}/spec_db"
+bputs "before db_config load"
# recreate test database and migrate it
db_config = YAML::load(File.open('config/database.yml'))["test"]
# initialize ActiveRecord's db connection\
+
+
+bputs "before recreate db"
SpecDb::recreate_database(db_config)
+
+bputs "before connect db"
ActiveRecord::Base.establish_connection(YAML::load(File.open('config/database.yml'))["test"])
+
+bputs "before load jam_ruby"
require 'jam_ruby'
# uncomment this to see active record logs
@@ -34,13 +51,21 @@ tests_started = false
Thread.new {
- sleep 30
+ if ENV['BUILD_NUMBER']
+ sleep 240
+ else
+ sleep 30
+ end
+
unless tests_started
+ bputs "tests are hung. exiting..."
puts "tests are hung. exiting..."
exit! 20
end
}
+bputs "before load websocket server"
+
current = Thread.current
Thread.new do
ActiveRecord::Base.connection.disconnect!
@@ -59,25 +84,41 @@ Thread.new do
puts "websocket-gateway failed: #{e}"
end
end
+
+bputs "before websocket thread wait"
Thread.stop
+bputs "before connection reestablish"
ActiveRecord::Base.connection.disconnect!
+bputs "before connection reestablishing"
ActiveRecord::Base.establish_connection(YAML::load(File.open('config/database.yml'))["test"])
#Spork.prefork do
# Loading more in this block will cause your tests to run faster. However,
# if you change any configuration or code from libraries loaded here, you'll
# need to restart spork for it take effect.
# This file is copied to spec/ when you run 'rails generate rspec:install'
+bputs "before load environment"
+begin
require File.expand_path("../../config/environment", __FILE__)
+rescue => e
+ bputs "exception in load environment"
+ bputs "e: #{e}"
+end
+
+bputs "before loading rails"
require 'rspec/rails'
+bputs "before connection autorun"
require 'rspec/autorun'
+bputs "before load capybara"
require 'capybara'
require 'capybara/rspec'
require 'capybara-screenshot/rspec'
+bputs "before load poltergeist"
require 'capybara/poltergeist'
+bputs "before register capybara"
Capybara.register_driver :poltergeist do |app|
driver = Capybara::Poltergeist::Driver.new(app, { debug: false, phantomjs_logger: File.open('log/phantomjs.out', 'w') })
end
diff --git a/web/spec/support/utilities.rb b/web/spec/support/utilities.rb
index b053f6514..7cd3869c9 100644
--- a/web/spec/support/utilities.rb
+++ b/web/spec/support/utilities.rb
@@ -4,10 +4,19 @@ include ApplicationHelper
module Capybara
module Node
class Element
+
+ def attempt_hover
+ begin
+ hover
+ rescue => e
+ end
+ end
def hover_intent
hover
- hover
- hover
+ sleep 0.3
+ attempt_hover
+ sleep 0.3
+ attempt_hover
end
end
end
+
+
-