Merge pull request #363 from ASU/7.x-dev

7.x dev

Author: ctestama

.travis.yml

@@ -10,7 +10,6 @@ php:
 # make sure we test on latest trusty environment
 sudo: required
 dist: trusty
-group: edge
 
 # Cache Composer & Drush directories.
 cache:
@@ -33,8 +32,8 @@ branches:
 # TODO - Update from Selenium Server Standalone to alternative Marionette
 # https://developer.mozilla.org/en-US/docs/Mozilla/QA/Marionette/WebDriver
 # Addons not working with Firefox. SeleniumHQ issue? Manually adding proper FF version.
-#addons:
-#  firefox: "46.0.1"
+addons:
+  chrome: stable
 
 # Cut down on git depth from default of 50
 git:
@@ -50,24 +49,27 @@ before_install:
   - sleep 1
   # Disable PHP features - XDebug
   - phpenv config-rm xdebug.ini
+  #- google-chrome-stable --headless --disable-gpu --remote-debugging-port=9222 http://localhost &
 
 install:
   - sudo apt-get update > /dev/null
   - "mysql -e 'create database drupal;'"
 
-  # Install Firefox manually until SeleniumHQ fixes the problem with the version not being reported to Travis-CI
-  - sudo mkdir /usr/local/bin/firefoxhack
-  - sudo wget --directory-prefix=/tmp http://ftp.mozilla.org/pub/firefox/releases/46.0.1/linux-x86_64/en-US/firefox-46.0.1.tar.bz2
-  - sudo tar -xjf /tmp/firefox-46.0.1.tar.bz2 -C /usr/local/bin/firefoxhack --strip-components=1
-  - export PATH="/usr/local/bin/firefoxhack:$PATH"
-  - echo "Using Firefox version $(firefox --version)"
-
   # Install latest Drush 7.x.
   - export PATH="$HOME/.composer/vendor/bin:$PATH"
   - composer global require --no-interaction drush/drush:7.*
 
+  # get chromedriver
+  - cd ~/
+  - wget -N https://chromedriver.storage.googleapis.com/73.0.3683.68/chromedriver_linux64.zip
+  - unzip ~/chromedriver_linux64.zip -d ~/
+  - rm ~/chromedriver_linux64.zip
+  - sudo mv -f ~/chromedriver /usr/local/share/
+  - sudo chmod +x /usr/local/share/chromedriver
+  - sudo ln -s /usr/local/share/chromedriver /usr/local/bin/chromedriver
+
   # Build Behat dependencies
-  - cd profiles/openasu/modules/panopoly/panopoly_test/behat
+  - cd $TRAVIS_BUILD_DIR/profiles/openasu/modules/panopoly/panopoly_test/behat
   - composer install --no-interaction
   # Build Behat dependencies
   - cd ../../../custom/webspark_test/behat
@@ -85,6 +87,8 @@ install:
   # Setup files
   - sudo chmod -R 777 sites
 
+
+
   # Get Selenium
   - wget https://selenium-release.storage.googleapis.com/2.53/selenium-server-standalone-2.53.0.jar
   - java -jar selenium-server-standalone-2.53.0.jar > /dev/null 2>&1 &

profiles/openasu/modules/custom/webspark_test/behat/behat.travis.yml

@@ -1,16 +1,27 @@
 imports:
     - behat.common.yml
+#
 default:
   extensions:
     Behat\MinkExtension:
+      selenium2:
+        # This will probably be the same always, if you follow the guide for browsers below.
+        wd_host: http://localhost:4444/wd/hub
+        capabilities:
+          chrome:
+            switches:
+              - "--headless"
+              - "--disable-gpu"
+              - "--no-sandbox"
+      javascript_session: selenium2
+      browser_name: chrome
       base_url: http://127.0.0.1:8888
       files_path: './profiles/openasu/modules/custom/webspark_test/behat'
     Drupal\DrupalExtension:
       drush:
         root: "/home/travis/build/ASU/webspark-drops-drupal7"
       drupal:
         drupal_root: "/home/travis/build/ASU/webspark-drops-drupal7"
-
       # Look in the profile modules directory and pull in module subcontexts.
       subcontexts:
         paths:

profiles/openasu/modules/panopoly/panopoly_test/behat/behat.travis.yml

@@ -4,14 +4,24 @@ imports:
 default:
   extensions:
     Behat\MinkExtension:
+      selenium2:
+        # This will probably be the same always, if you follow the guide for browsers below.
+        wd_host: http://localhost:4444/wd/hub
+        capabilities:
+          chrome:
+            switches:
+              - "--headless"
+              - "--disable-gpu"
+              - "--no-sandbox"
+      javascript_session: selenium2
+      browser_name: chrome
       base_url: http://127.0.0.1:8888
       files_path: './profiles/openasu/modules/panopoly/panopoly_test/behat'
     Drupal\DrupalExtension:
       drush:
         root: "/home/travis/build/ASU/webspark-drops-drupal7"
       drupal:
         drupal_root: "/home/travis/build/ASU/webspark-drops-drupal7"
-
       # Look in the profile modules directory and pull in module subcontexts.
       subcontexts:
         paths:

profiles/openasu/modules/panopoly/panopoly_test/behat/features/video_widget.feature

@@ -12,7 +12,7 @@ Feature: Add video widget
       And I click "Add video" in the "CTools modal" region
     Then I should see "Configure new Add video"
 
-  @api @javascript @panopoly_widgets @webspark_broken @webspark_ignore
+  @api @javascript @panopoly_widgets
   Scenario: Add a YouTube video
     When I fill in "Testing video" for "edit-title"
     When I click "Browse"

profiles/openasu/modules/webspark_featurescustom/asu_gcse/asu_gcse.install

@@ -0,0 +1,8 @@
+<?php
+
+/***
+ * Implements hook_enable()
+ */
+function asu_gcse_enable() {
+  user_role_grant_permissions(DRUPAL_ANONYMOUS_RID, array('search Google CSE'));
+}

profiles/openasu/modules/webspark_featurescustom/asu_gcse/css/asu_gcse.css

@@ -1,11 +1,13 @@
 /* GOOGLE SEARCH */
 
 /* Removes border that's being added to nav pills on hover */
+/*
 .page-search #top-content #tabs .nav-pills li a:hover {
   border: none !important;
-}
+}*/
 
 /* Forces ASU brand standard button styling */
+/*
 .page-search #top-content #tabs .nav-pills > li.active > a {
   background-color: #8c1d40 !important;
   color: #ffffff !important;
@@ -26,7 +28,7 @@
   color: #2a2a2a !important;
   font-weight: 400 !important;
 }
-
+*/
 /* Hides various unneeded elements on the page (e.g. the ad area, the extra search box, files showing in results, etc) */
 .page-search .gsc-wrapper .gsc-adBlock,
 .page-search .gsc-search-box,
@@ -115,5 +117,32 @@
 /* Forces search box and search submit button onto the same line */
 .page-search .search-form .container-inline div,
 .page-search .search-form #edit-submit {
-  display: inline-block !important;
+  display: inline-block;
+}
+
+.page-search #top-content #tabs .nav-pills > li.active > a, .page-search #top-content #tabs .nav-pills > li.active > a:hover {
+  background-color: transparent;
+  color: #2a2a2a;
+  border-bottom: 5px solid #a30046;
+  padding-left: 0;
+  padding-right: 0;
+  margin-right: 2.2em;
+  border-radius: 0;
+  font-size: 18px;
+}
+
+.page-search #top-content #tabs .nav-pills li a, .page-search #top-content #tabs .nav-pills li a:hover {
+  background-color: transparent;
+  color: #2a2a2a;
+  font-weight: 400;
+  padding-left: 0;
+  padding-right: 0;
+  margin-right: 2.2em;
+  border-radius: 0;
+  font-size: 18px;
+}
+
+.page-search #top-content #tabs .nav-pills li a:hover {
+  color: #000;
+  border-bottom: 5px solid #a30046;
 }

profiles/openasu/modules/webspark_featurescustom/asu_gcse/js/asu_gcse.js

@@ -33,8 +33,9 @@
         // Forced a document title, because it doesn't reflect the h1 title (on both search pages)
         document.title = "Search Results | " + asu_site_title;
 
+        var thetitle = $('#page-title');
         // Set page title (h1) to 'Search Results' (on both search pages)
-        $('#page-title').text("Search Results");
+        thetitle.text("Search Results");
 
         // If the first nav pill URL matches the node_search form ('search/node') then proceed
         if (first_nav_pill_url && first_nav_pill_url.indexOf(node_search) != -1) {

profiles/openasu/openasu.make

@@ -56,7 +56,6 @@ projects[panopoly_test][patch][137] = patches/webspark-847_panopoly-test-137-upd
 projects[panopoly_test][patch][1370] = patches/webspark-847_behat_common.patch
 projects[panopoly_test][patch][142] = patches/webspark-944_add-init-config-tests-panopoly-test.patch
 projects[panopoly_test][patch][143] = patches/webspark-1066-panopoly-test-v146.patch
-projects[panopoly_test][patch][1640] = patches/v1.64-behat-test-disable-video-test.patch
 
 ; ASU-specific, Webspark-agnostic modules (/custom directory contents)
 ;projects[asu_drupal_modules][type] = module
@@ -166,6 +165,10 @@ projects[google_appliance][version] = 1.14
 projects[google_appliance][type] = module
 projects[google_appliance][subdir] = contrib
 
+projects[google_cse][version] = 2.5
+projects[google_cse][type] = module
+projects[google_cse][subdir] = contrib
+
 projects[maxlength][version] = 3.2-beta2
 projects[maxlength][type] = module
 projects[maxlength][subdir] = contrib