Fix broken tests (publiclab#1001)

* h

* h

* fix broken tests

* fix

* fix click capybara

* add parentheses

* click_on

* fix image placement system test

* put back selenium for travis

* use old driver

Gemfile

@@ -66,6 +66,8 @@ end
 
 group :development, :test do
   gem 'capybara'
+  # see https://github.com/SeleniumHQ/selenium/issues/5248
+  # gem 'webdrivers'
   gem 'selenium-webdriver'
   gem 'byebug', '~> 11.0.1', platforms: [:mri, :mingw, :x64_mingw]
   gem 'faker', '~> 2.2.1'

Gemfile.lock

@@ -339,8 +339,7 @@ DEPENDENCIES
   byebug (~> 11.0.1)
   capybara
   codecov
-  foreman (~> 0.85.0)
-  faker (~> 2.1.2)
+  faker (~> 2.2.1)
   friendly_id
   geokit-rails (= 1.1.4)
   httparty

app/assets/javascripts/mapknitter/core/Class.js

@@ -6,15 +6,15 @@ var MapKnitter = {};
  * See https://github.com/Leaflet/Leaflet/blob/master/src/core/Class.js.
  */
 
-MapKnitter.Class = function() {};
-MapKnitter.Class.extend = function(obj) {
-	var NewClass = function() {
+MapKnitter.Class = function () { };
+MapKnitter.Class.extend = function (obj) {
+	var NewClass = function () {
 		if (this.initialize) {
 			this.initialize.apply(this, arguments);
 		}
 	};
 
-	var F = function() {};
+	var F = function () { };
 	F.prototype = this.prototype;
 
 	var proto = new F();
@@ -35,6 +35,6 @@ MapKnitter.Class.extend = function(obj) {
 
 	return NewClass;
 };
-MapKnitter.Class.include = function(obj) {
+MapKnitter.Class.include = function (obj) {
 	L.extend(this.prototype, obj);
-};
+};

app/views/maps/show.html.erb

@@ -17,7 +17,7 @@
             </div>
         </div>
         <div class="col-md-6">
-            <a href="/maps/edit/<%= @map.slug %>">
+            <a href="/maps/<%= @map.slug %>/edit">
                 <button class="btn btn-outline-info float-right">
                     <span class="fas fa-pencil-alt"> </span> Edit this map
                 </button>

test/controllers/front_ui_controller_test.rb

@@ -45,13 +45,4 @@ def teardown
     assert !@maps.collect(&:name).include?('Saugus Landfill Incinerator')
     assert @maps.collect(&:name).include?('Cubbon Park')
   end
-
-  test 'view map page' do
-    map = maps(:saugus)
-    get :view_map, id: map.slug
-
-    assert_response :success
-    assert assigns(:maps)
-    assert_template 'front_ui/view_map'
-  end
 end

test/controllers/maps_controller_test.rb

@@ -313,7 +313,7 @@ def export_anonmymous_map
   end
 
   test 'show' do
-    get :show, id: @map.slug
+    get :show, params: { id: @map.slug}
 
     assert_response :success
     assert assigns(:maps)

test/system/images_test.rb

@@ -26,8 +26,8 @@ def setup
     #log in 
     page.set_rack_session(user_id: @user.id)
 
-    visit "/maps/#{@map.slug}"
-    click_link('Images')
+    visit "/maps/#{@map.slug}/edit"
+    click_on 'Images'
 
     #expect layers to not have an ldi instance before placing
     assert !page.evaluate_script(check_if_image_placed)