* making sure 'congrtulations.js' doesn't mix in with main client page
This commit is contained in:
parent
6e7363f12d
commit
b586cf73d4
|
|
@ -13,7 +13,8 @@
|
|||
//= require jquery
|
||||
//= require jquery_ujs
|
||||
//= require jquery.color
|
||||
//= require jquery.cookie
|
||||
//= require jquery.Jcrop
|
||||
//= require jquery.naturalsize
|
||||
//= require bootstrap
|
||||
//= require_tree .
|
||||
//= require_directory .
|
||||
|
|
|
|||
|
|
@ -16,7 +16,6 @@
|
|||
for ( var property in data ) count++;
|
||||
|
||||
|
||||
|
||||
if(count == 0) {
|
||||
alert("Currently unable to list client software downloads.");
|
||||
}
|
||||
|
|
@ -49,7 +48,7 @@
|
|||
})
|
||||
.fail(function() {
|
||||
downloads.removeClass('spinner-large');
|
||||
alert("Currently unable to list client software downloads.");
|
||||
alert("Currently unable to list client software downloads due to error.");
|
||||
})
|
||||
})
|
||||
})(window, jQuery)
|
||||
|
|
@ -4,7 +4,7 @@
|
|||
<%= javascript_include_tag "jamkazam" %>
|
||||
<%= javascript_include_tag "utils" %>
|
||||
<%= javascript_include_tag "jam_rest" %>
|
||||
<%= javascript_include_tag "congratulations" %>
|
||||
<%= javascript_include_tag "signup/congratulations" %>
|
||||
|
||||
<div class="logo-message">
|
||||
<%= link_to root_path do %>
|
||||
|
|
|
|||
6
build
6
build
|
|
@ -45,7 +45,7 @@ if [ -z $SKIP_TESTS ]; then
|
|||
fi
|
||||
|
||||
|
||||
echo "running jasmine tests"
|
||||
echo "running karma tests"
|
||||
#http://shortforgilbert.com/blog/2011/03/25/headless-jasmine-ci
|
||||
# TODO starting Xvfb here because we don't do this on start of build server
|
||||
# If you run it once, it will background/nohup itself, so this is 'lazy'
|
||||
|
|
@ -54,9 +54,9 @@ if [ -z $SKIP_TESTS ]; then
|
|||
DISPLAY=":99" karma start spec/javascripts/karma.ci.conf.js
|
||||
|
||||
if [ "$?" = "0" ]; then
|
||||
echo "success: jasmine tests completed"
|
||||
echo "success: karma tests completed"
|
||||
else
|
||||
echo "running jasmine tests failed"
|
||||
echo "running karma tests failed"
|
||||
exit 1
|
||||
fi
|
||||
|
||||
|
|
|
|||
|
|
@ -77,6 +77,9 @@ Spork.prefork do
|
|||
# config.mock_with :rr
|
||||
config.mock_with :rspec
|
||||
|
||||
# by default, do not run tests marked as 'slow'
|
||||
config.filter_run_excluding slow: true unless ENV['RUN_SLOW_TESTS'] == "1"
|
||||
|
||||
# Remove this line if you're not using ActiveRecord or ActiveRecord fixtures
|
||||
config.fixture_path = "#{::Rails.root}/spec/fixtures"
|
||||
|
||||
|
|
|
|||
Loading…
Reference in New Issue