Commit b96d2666 by Clinton Blackburn Committed by Clinton Blackburn

Running MongoDB and Elasticsearch as daemons

Running these services as daemons so that we can take advantage of Travis' container-based infrastructure. One test had to be updated, most likely due to sorting not behaving as expected. All tests will be updated in the future to properly prepare test data, and not rely on sorting/querying.
parent 58a5bc37
sudo: false
language: ruby language: ruby
rvm: rvm:
...@@ -5,18 +7,20 @@ rvm: ...@@ -5,18 +7,20 @@ rvm:
cache: bundler cache: bundler
services:
- elasticsearch
before_install: before_install:
- gem update bundler # Ensure we use the latest version of bundler. Travis' default version of outdated. - gem update bundler # Ensure we use the latest version of bundler. Travis' default version of outdated.
- wget https://download.elasticsearch.org/elasticsearch/elasticsearch/elasticsearch-0.90.11.deb && sudo dpkg --force-confnew -i elasticsearch-0.90.11.deb && sudo service elasticsearch restart
# Install mongo 2.6.4 according to http://docs.mongodb.org/manual/tutorial/install-mongodb-on-ubuntu/ # Run Elasticsearch as a daemon
# TODO: This won't be necessary when travis switches to 2.6 by default - see https://github.com/travis-ci/travis-ci/issues/2246 - curl -O https://download.elasticsearch.org/elasticsearch/elasticsearch/elasticsearch-0.90.13.zip
- sudo apt-key adv --keyserver hkp://keyserver.ubuntu.com:80 --recv 7F0CEB10 - unzip elasticsearch-0.90.13.zip
- echo 'deb http://downloads-distro.mongodb.org/repo/ubuntu-upstart dist 10gen' | sudo tee /etc/apt/sources.list.d/mongodb.list - elasticsearch-0.90.13/bin/elasticsearch
- sudo apt-get update -q
- sudo apt-get install -y mongodb-org=2.6.4 mongodb-org-server=2.6.4 mongodb-org-shell=2.6.4 mongodb-org-mongos=2.6.4 mongodb-org-tools=2.6.4 # Run MongoDB as a daemon
- mongo --version - curl -O https://fastdl.mongodb.org/linux/mongodb-linux-x86_64-2.6.11.tgz
- tar -zxf mongodb-linux-x86_64-2.6.11.tgz
- export PATH=mongodb-linux-x86_64-2.6.11/bin:$PATH
- mkdir -p ./mongo/db
- mkdir -p ./mongo/log
- mongod --fork --dbpath ./mongo/db --logpath ./mongo/log/mongodb.log
script: bundle exec rspec script: bundle exec rspec
...@@ -169,12 +169,12 @@ describe "app" do ...@@ -169,12 +169,12 @@ describe "app" do
Comment.all.select{|c| c.id == comment.id}.first.should be_nil Comment.all.select{|c| c.id == comment.id}.first.should be_nil
end end
it "can delete a sub comment" do it "can delete a sub comment" do
parent = CommentThread.first.comments.first child_comment = Comment.where(:parent.exists => true).first
sub_comment = parent.children.first parent_comment = child_comment.parent
id = sub_comment.id delete "/api/v1/comments/#{child_comment.id}"
delete "/api/v1/comments/#{id}"
Comment.where(:id => id).should be_empty Comment.where(:id => child_comment.id).should be_empty
parent.children.where(:id => id).should be_empty parent_comment.children.where(:id => child_comment.id).should be_empty
end end
it "returns 400 when the comment does not exist" do it "returns 400 when the comment does not exist" do
delete "/api/v1/comments/does_not_exist" delete "/api/v1/comments/does_not_exist"
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment