[Git][noosfero/noosfero][master] 3 commits: selenium-webdriver: avoid requirement of geckodriver

[Bráulio Bhavamitra]

Bráulio Bhavamitra pushed to branch master at Noosfero / noosfero


Commits:
1e6357eb by Braulio Bhavamitra at 2017-03-05T18:32:48-03:00
selenium-webdriver: avoid requirement of geckodriver

- - - - -
04d5c50d by Braulio Bhavamitra at 2017-03-05T18:47:37-03:00
Cleanup on lib by moving services and concerns

- - - - -
cc953e70 by Braulio Bhavamitra at 2017-03-05T19:10:44-03:00
Comment Gemfile

- - - - -


13 changed files:

- .travis.yml
- Gemfile
- lib/find_by_contents.rb → app/concerns/find_by_contents.rb
- lib/maybe_add_http.rb → app/concerns/maybe_add_http.rb
- app/models/application_record.rb
- lib/postgresql_attachment_fu.rb → app/models/concerns/postgresql_attachment_fu.rb
- lib/time_scopes.rb → app/models/concerns/time_scopes.rb
- lib/upload_sanitizer.rb → app/models/concerns/upload_sanitizer.rb
- lib/feed_handler.rb → app/services/feed_handler.rb
- lib/feed_updater.rb → app/services/feed_updater.rb
- lib/feed_writer.rb → app/services/feed_writer.rb
- config/initializers/00_dependencies.rb
- − lib/route_if.rb


Changes:

=====================================
.travis.yml
=====================================
--- a/.travis.yml
+++ b/.travis.yml
@@ -32,7 +32,8 @@ addons:
   artifacts:
     paths:
       - $(ls tmp/artifact* | tr "\n" ":")
-  firefox: '48.0.2'
+  # same as in docker ci image
+  firefox: '45.7.0'
 
 before_install:
   # geckodriver, from http://www.columbia.edu/~njn2118/journal/2016/10/28.html


=====================================
Gemfile
=====================================
--- a/Gemfile
+++ b/Gemfile
@@ -73,16 +73,20 @@ end
 group :cucumber do
   gem 'capybara',               '~> 2.2'
   gem 'launchy'
-  gem 'cucumber',                '~> 1.3'
-  gem 'cucumber-rails',         '~> 1.4.2', :require => false
+  gem 'cucumber',               '~> 1.3'
+  gem 'cucumber-rails',         '~> 1.4.2', require: false
   gem 'database_cleaner',       '~> 1.3'
-  gem 'selenium-webdriver',     '>= 2.53'
+  # Selenium WebDriver 3+ depends on geckodriver
+  gem 'selenium-webdriver',     '>= 2.53', '< 3.0'
   gem 'chromedriver-helper' if ENV['SELENIUM_DRIVER'] == 'chrome'
 end
 
 # Requires custom dependencies
 eval(File.read('config/Gemfile'), binding) rescue nil
 
+##
+# Gems inside repository, to move outside
+#
 vendor = Dir.glob('vendor/{,plugins/}*') - ['vendor/plugins']
 vendor.each do |dir|
   plugin = File.basename dir
@@ -97,3 +101,4 @@ end
 Dir.glob('config/plugins/*/Gemfile').each do |gemfile|
   eval File.read(gemfile)
 end
+


=====================================
lib/find_by_contents.rb → app/concerns/find_by_contents.rb
=====================================
--- a/lib/find_by_contents.rb
+++ b/app/concerns/find_by_contents.rb


=====================================
lib/maybe_add_http.rb → app/concerns/maybe_add_http.rb
=====================================
--- a/lib/maybe_add_http.rb
+++ b/app/concerns/maybe_add_http.rb


=====================================
app/models/application_record.rb
=====================================
--- a/app/models/application_record.rb
+++ b/app/models/application_record.rb
@@ -1,5 +1,8 @@
 class ApplicationRecord < ActiveRecord::Base
 
+  extend PostgresqlAttachmentFu::ClassMethods
+  include UploadSanitizer
+
   self.abstract_class       = true
   self.store_full_sti_class = true
 


=====================================
lib/postgresql_attachment_fu.rb → app/models/concerns/postgresql_attachment_fu.rb
=====================================
--- a/lib/postgresql_attachment_fu.rb
+++ b/app/models/concerns/postgresql_attachment_fu.rb
@@ -16,5 +16,3 @@ module PostgresqlAttachmentFu
 
 end
 
-ActiveRecord::Base.extend PostgresqlAttachmentFu::ClassMethods
-


=====================================
lib/time_scopes.rb → app/models/concerns/time_scopes.rb
=====================================
--- a/lib/time_scopes.rb
+++ b/app/models/concerns/time_scopes.rb


=====================================
lib/upload_sanitizer.rb → app/models/concerns/upload_sanitizer.rb
=====================================
--- a/lib/upload_sanitizer.rb
+++ b/app/models/concerns/upload_sanitizer.rb
@@ -10,4 +10,3 @@ module UploadSanitizer
   end
 end
 
-ActiveRecord::Base.send :include, UploadSanitizer


=====================================
lib/feed_handler.rb → app/services/feed_handler.rb
=====================================
--- a/lib/feed_handler.rb
+++ b/app/services/feed_handler.rb


=====================================
lib/feed_updater.rb → app/services/feed_updater.rb
=====================================
--- a/lib/feed_updater.rb
+++ b/app/services/feed_updater.rb


=====================================
lib/feed_writer.rb → app/services/feed_writer.rb
=====================================
--- a/lib/feed_writer.rb
+++ b/app/services/feed_writer.rb


=====================================
config/initializers/00_dependencies.rb
=====================================
--- a/config/initializers/00_dependencies.rb
+++ b/config/initializers/00_dependencies.rb
@@ -15,7 +15,3 @@ end
 # extensions
 require 'extensions'
 
-# locally-developed modules
-require 'route_if'
-require 'maybe_add_http'
-


=====================================
lib/route_if.rb deleted
=====================================
--- a/lib/route_if.rb
+++ /dev/null
@@ -1 +0,0 @@
-# FIXME implement conditional routing wrt Rails 3 here



View it on GitLab: https://gitlab.com/noosfero/noosfero/compare/4c773d2309eab1461c3bddd7303f839ed0900752...cc953e7072cb37cf2b2d5205b2fd4ae7b1c32a1a
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://listas.softwarelivre.org/pipermail/noosfero-dev/attachments/20170305/1b3c901d/attachment-0001.html>