diff --git a/.gitmodules b/.gitmodules deleted file mode 100644 index 91b24fcd..00000000 --- a/.gitmodules +++ /dev/null @@ -1,3 +0,0 @@ -[submodule "pages"] - path = pages - url = git@github.com:pivotal/jasmine.git diff --git a/.rspec b/.rspec index 35f4d744..4e1e0d2f 100644 --- a/.rspec +++ b/.rspec @@ -1,2 +1 @@ --color ---format Fuubar diff --git a/.travis.yml b/.travis.yml new file mode 100644 index 00000000..9e926baf --- /dev/null +++ b/.travis.yml @@ -0,0 +1,9 @@ +# before_script: + # - "sh -e /etc/init.d/xvfb start" +before_install: + - "export DISPLAY=:99.0" + - "sh -e /etc/init.d/xvfb start"# +script: "DISPLAY=:99.0 bundle exec rake jasmine_core_spec" + +rvm: + - "1.9.3" diff --git a/README.markdown b/README.markdown index 6382295d..a7eefb17 100644 --- a/README.markdown +++ b/README.markdown @@ -1,4 +1,5 @@ -[Jasmine](http://pivotal.github.com/jasmine/) +[Jasmine](http://pivotal.github.com/jasmine/) + ======= **A JavaScript Testing Framework** diff --git a/pages b/pages deleted file mode 160000 index 00ba05c2..00000000 --- a/pages +++ /dev/null @@ -1 +0,0 @@ -Subproject commit 00ba05c213c22325e2dfc21307a8d07a379fd9a4 diff --git a/spec/jasmine.yml b/spec/jasmine.yml index a3f08713..bd25c368 100644 --- a/spec/jasmine.yml +++ b/spec/jasmine.yml @@ -1,10 +1,28 @@ jasmine_dir: - 'src' +#This 'magic' inclusion order allows the travis build to pass. +#TODO: search for the correct files to include to prevent jasmine_files: - 'core/base.js' - 'core/util.js' - 'core/Reporter.js' + #end of known dependencies + - 'core/Env.js' + - 'core/Block.js' + - 'core/JsApiReporter.js' + - 'core/Matchers.js' + - 'core/mock-timeout.js' + - 'core/MultiReporter.js' + - 'core/NestedResults.js' + - 'core/PrettyPrinter.js' + - 'core/Queue.js' + - 'core/Runner.js' + - 'core/Spec.js' + - 'core/Suite.js' + - 'core/WaitsBlock.js' + - 'core/WaitsForBlock.js' - 'html/HtmlReporterHelpers.js' + - 'html/HtmlReporter.js' - '**/*.js' jasmine_css_files: - 'html/jasmine.css' @@ -13,7 +31,7 @@ stylesheets: helpers: - 'helpers/**/*.js' spec_files: - - '**/*[sS]pec.js' + - '**/*[Ss]pec.js' src_dir: spec_dir: - 'spec'