From 06f141bdfb3255fe84a684b694f9760347371881 Mon Sep 17 00:00:00 2001 From: schisma Date: Sun, 10 May 2015 21:44:03 +0200 Subject: [PATCH 01/10] added travis build script --- .travis.yml | 4 ++++ Gemfile | 1 + 2 files changed, 5 insertions(+) create mode 100644 .travis.yml diff --git a/.travis.yml b/.travis.yml new file mode 100644 index 00000000..68a303f4 --- /dev/null +++ b/.travis.yml @@ -0,0 +1,4 @@ +language: ruby +rvm: 2.1 +before_script: + - psql -c 'create database justask_test;' -U postgres \ No newline at end of file diff --git a/Gemfile b/Gemfile index 0b99f0b4..3484abaa 100644 --- a/Gemfile +++ b/Gemfile @@ -71,6 +71,7 @@ group :production do end group :development, :test do + gem 'rake' gem 'thin' gem 'rspec-rails', '~> 3.0.0' gem 'factory_girl_rails', require: false From 2503ca3793e0c42dc61c963bf57860245a080c51 Mon Sep 17 00:00:00 2001 From: schisma Date: Sun, 10 May 2015 21:45:31 +0200 Subject: [PATCH 02/10] trigger --- .travis.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index 68a303f4..81881031 100644 --- a/.travis.yml +++ b/.travis.yml @@ -1,4 +1,4 @@ language: ruby rvm: 2.1 before_script: - - psql -c 'create database justask_test;' -U postgres \ No newline at end of file + - psql -c 'create database justask_test;' -U postgres \ No newline at end of file From feab7f7f3cc82809aef53e3661a23015f034e13f Mon Sep 17 00:00:00 2001 From: schisma Date: Sun, 10 May 2015 21:52:48 +0200 Subject: [PATCH 03/10] update gemfile.lock --- Gemfile.lock | 1 + 1 file changed, 1 insertion(+) diff --git a/Gemfile.lock b/Gemfile.lock index 58e34ecb..171413af 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -496,6 +496,7 @@ DEPENDENCIES rails (= 4.2.1) rails-assets-growl rails_admin + rake redcarpet redis rspec-rails (~> 3.0.0) From 9a3594bcb11f335b55af92c622b7b9253cec6a22 Mon Sep 17 00:00:00 2001 From: schisma Date: Sun, 10 May 2015 21:56:54 +0200 Subject: [PATCH 04/10] fix things --- .travis.yml | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index 81881031..3a4e6507 100644 --- a/.travis.yml +++ b/.travis.yml @@ -1,4 +1,5 @@ language: ruby rvm: 2.1 before_script: - - psql -c 'create database justask_test;' -U postgres \ No newline at end of file + - psql -c 'create database justask_test;' -U postgres + - cp config/database.yml.postgres config/database.yml \ No newline at end of file From 7ad1a9fb5352d3155c71228c33070f4e6a027500 Mon Sep 17 00:00:00 2001 From: schisma Date: Sun, 10 May 2015 22:01:03 +0200 Subject: [PATCH 05/10] MORE COPYING --- .travis.yml | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index 3a4e6507..d8ca753c 100644 --- a/.travis.yml +++ b/.travis.yml @@ -2,4 +2,5 @@ language: ruby rvm: 2.1 before_script: - psql -c 'create database justask_test;' -U postgres - - cp config/database.yml.postgres config/database.yml \ No newline at end of file + - cp config/database.yml.postgres config/database.yml + - cp config/justask.yml.example config/justask.yml \ No newline at end of file From 0dfe4ffa573311af10a960429547d7c53cf538f8 Mon Sep 17 00:00:00 2001 From: schisma Date: Sun, 10 May 2015 22:06:09 +0200 Subject: [PATCH 06/10] add migrating db --- .travis.yml | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index d8ca753c..74b275a6 100644 --- a/.travis.yml +++ b/.travis.yml @@ -3,4 +3,5 @@ rvm: 2.1 before_script: - psql -c 'create database justask_test;' -U postgres - cp config/database.yml.postgres config/database.yml - - cp config/justask.yml.example config/justask.yml \ No newline at end of file + - cp config/justask.yml.example config/justask.yml + - bundle exec rake:db migrate \ No newline at end of file From c393cb419d16695c452694747ebeef9cd71a131d Mon Sep 17 00:00:00 2001 From: schisma Date: Sun, 10 May 2015 22:10:36 +0200 Subject: [PATCH 07/10] ok now it's just me being stupid --- .travis.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index 74b275a6..49a1b224 100644 --- a/.travis.yml +++ b/.travis.yml @@ -4,4 +4,4 @@ before_script: - psql -c 'create database justask_test;' -U postgres - cp config/database.yml.postgres config/database.yml - cp config/justask.yml.example config/justask.yml - - bundle exec rake:db migrate \ No newline at end of file + - bundle exec rake db:migrate \ No newline at end of file From c97499020662f0e5f84504b6c49c6b2e71c57eb1 Mon Sep 17 00:00:00 2001 From: schisma Date: Sun, 10 May 2015 22:18:46 +0200 Subject: [PATCH 08/10] laziness fix --- .travis.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index 49a1b224..bd6387be 100644 --- a/.travis.yml +++ b/.travis.yml @@ -1,7 +1,7 @@ language: ruby rvm: 2.1 before_script: - - psql -c 'create database justask_test;' -U postgres + - bundle exec rake db:create - cp config/database.yml.postgres config/database.yml - cp config/justask.yml.example config/justask.yml - bundle exec rake db:migrate \ No newline at end of file From 1a9fa621cf7e3e012c0fac7560a2beecf9770514 Mon Sep 17 00:00:00 2001 From: schisma Date: Sun, 10 May 2015 22:24:58 +0200 Subject: [PATCH 09/10] replace db:create with db:setup --- .travis.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index bd6387be..3f98925d 100644 --- a/.travis.yml +++ b/.travis.yml @@ -1,7 +1,7 @@ language: ruby rvm: 2.1 before_script: - - bundle exec rake db:create - cp config/database.yml.postgres config/database.yml - cp config/justask.yml.example config/justask.yml + - bundle exec rake db:setup - bundle exec rake db:migrate \ No newline at end of file From fd374ca64033658d20935a297c22ec0677ebc64e Mon Sep 17 00:00:00 2001 From: schisma Date: Sun, 10 May 2015 22:35:36 +0200 Subject: [PATCH 10/10] remove subscribecontroller --- spec/controllers/subscribe_controller_spec.rb | 5 ----- 1 file changed, 5 deletions(-) delete mode 100644 spec/controllers/subscribe_controller_spec.rb diff --git a/spec/controllers/subscribe_controller_spec.rb b/spec/controllers/subscribe_controller_spec.rb deleted file mode 100644 index 0afc3489..00000000 --- a/spec/controllers/subscribe_controller_spec.rb +++ /dev/null @@ -1,5 +0,0 @@ -require 'rails_helper' - -RSpec.describe SubscribeController, :type => :controller do - -end