This repository was archived by the owner on Feb 25, 2020. It is now read-only.

Adding demo file so that PR can be created for Probo. #44

Open

grndlvl wants to merge 42 commits into 7.x-1.x from BearDemo

.probo.yaml

-Original file line number
+Diff line change
@@ -1,8 +1,9 @@
     steps:
-      - name: Make and install Bear
-        plugin: Drupal
-        makeFile: build-bear.make
-        profileName: bear
-        runInstall: true
+      - name: Run the profile script
+        command: './$SRC_DIR/profile-build.sh'
+      - name: Run install
+        command: "drush site-install --root=/var/www/html bear --db-url='mysqli://root:strongpassword@localhost/bear'"
+      - name: Set file directory permissions
+        command: 'chown -R www-data:www-data /var/www/html/sites/default/files'
       - name: Run behat tests
         command: 'cd /var/www/html/profiles/bear/tests ; composer install ; ./bin/behat --profile probo --tags "~@javascript"'

bear.info

-Original file line number
+Diff line change
@@ Expand Up / @@ -27,7 +27,6 @@ dependencies[] = asset_document @@
     dependencies[] = asset_image
     dependencies[] = bear_habitat
     dependencies[] = bear_necessities
-    dependencies[] = block_class
     dependencies[] = breadcrumbs_by_path
     dependencies[] = chosen
     dependencies[] = coffee
@@ Expand Down Expand Up / @@ -56,7 +55,6 @@ dependencies[] = linkit @@
     dependencies[] = menu_block
     dependencies[] = menu_expanded
     dependencies[] = module_filter
-    dependencies[] = multiform
     dependencies[] = oembed
     dependencies[] = oembedembedly
     dependencies[] = page_manager_templates
@@ Expand Down @@

demo

Empty file.

docs/contrib.md

-Original file line number
+Diff line change
@@ -0,0 +1,9 @@
+    #Bear Contributed Modules
+    We try to keep the overall size of the bear installation profile as small as possible, but packed with the most amount of features that we use on 90% of our client projects. We have built some additional features and wrote some custom code that doesn't quite get used enough to put into the main bear release. We have moved some of these features and settings to their own bear contributed modules that can be installed on any Drupal website to add these additional features.
+    #Projects
+    - [Bear Hunt](https://www.drupal.org/project/bear_hunt) - Bear Hunt provides a quick and powerful Solr Search API bundle that sets up a Solr Server and a default node index on your Drupal site.
+    - [Bear Slideshow](https://www.drupal.org/project/bear_show) - Bear Slideshow is a Features package that provides a responsive Flexslider Views Slideshow out of the box.
+    - [Bear Homepage](https://www.drupal.org/project/bear_home) - Bear Homepage is a Features package that provides an exported page manager configuration for an easy to configure custom homepage.

docs/features.md

-Original file line number
+Diff line change
@@ Expand Up / @@ -2,6 +2,6 @@ @@
     - Pre-configured [CKEditor](https://www.drupal.org/project/responsive_menus) WYSIWYG with file asset management.
     - Responsive [Bear Skin](https://www.drupal.org/project/bear_skin) theme with [Bear Coat](http://cgit.drupalcode.org/bear_skin/tree/bear_coat) sub-theme.
     - [Responsive Menus](https://www.drupal.org/project/responsive_menus) with [SIDR](https://github.com/artberri/sidr/releases) support.
-    - Sticky Footer option available
+    - Sticky Footer option available.
     - Site building and developer tools like [Views](https://www.drupal.org/project/views), [Panels](https://www.drupal.org/project/panels), [Features](https://www.drupal.org/project/features), and [Devel](https://www.drupal.org/project/views) out of the box.
     - See the full list of Contrib Modules that Bear includes in our modules.md file.

docs/modules.md

-Original file line number
+Diff line change
@@ Expand Up @@
     - advagg
     - asset
     - bear_habitat
-    - block_class
     - breadcrumbs_by_path
     - breakpoints
     - chosen
@@ Expand Down @@

drupal-org.make

-Original file line number
+Diff line change
@@ Expand Up @@
     ; @see https://www.drupal.org/node/2612602#comment-10550910
     projects[asset][patch][] = https://www.drupal.org/files/issues/2612602-3-asset-inline_entity_form_integration.patch
     projects[] = bear_habitat
-    projects[] = block_class
     projects[] = breadcrumbs_by_path
     projects[] = breakpoints
     projects[] = chosen
@@ Expand Down Expand Up / @@ -53,8 +52,7 @@ projects[linkit][version] = "2.x-dev" @@
     projects[] = menu_block
     projects[] = menu_expanded
     projects[] = module_filter
-    projects[] = multiform
-    projects[] = oembed
+    projects[oembed][version] = "1.x-dev"
     projects[] = page_manager_templates
     projects[] = panels
     projects[panelizer][version] = "3.x-dev"
@@ Expand Down @@

modules/bear_necessities/bear_necessities.default_environment_indicator_environments.inc

-Original file line number
+Diff line change
@@ Expand Up @@
       );
       $export['staging_environment'] = $environment;
+      $environment = new stdClass();
+      $environment->disabled = FALSE; /* Edit this to true to make a default environment disabled initially */
+      $environment->api_version = 1;
+      $environment->machine = 'probo_environment';
+      $environment->name = 'Probo environment';
+      $environment->regexurl = '.*probo.*';
+      $environment->settings = array(
+        'color' => '#6B044C',
+        'text_color' => '#ffffff',
+        'weight' => '95',
+        'position' => 'top',
+        'fixed' => 1,
+      );
+      $export['probo_environment'] = $environment;
       return $export;
     }

modules/bear_necessities/bear_necessities.features.ckeditor_profile.inc

            
                      Original file line number
                      Diff line number
                      Diff line change
                  
    @@ -14,8 +14,8 @@ function bear_necessities_ckeditor_profile_defaults() {
  
          'settings' => array(

            'ss' => 2,

            'toolbar' => '[

        [\'Bold\',\'Italic\',\'Link\',\'Anchor\'],

        [\'Format\',\'RemoveFormat\',\'JustifyLeft\',\'JustifyCenter\',\'JustifyRight\',\'JustifyBlock\',\'NumberedList\',\'BulletedList\',\'Table\'],

        [\'Bold\',\'Italic\'],

        [\'Format\',\'Scayt\',\'RemoveFormat\',\'JustifyLeft\',\'JustifyCenter\',\'JustifyRight\',\'JustifyBlock\',\'NumberedList\',\'BulletedList\',\'Table\'],

        [\'Blockquote\',\'PasteFromWord\',\'linkit\',\'asset_document\',\'asset_image\',\'asset_embed\',\'assetSearch\']

    ]',

            'expand' => 't',

    @@ -31,7 +31,7 @@ function bear_necessities_ckeditor_profile_defaults() {
  
            'extraAllowedContent' => '',

            'enter_mode' => 'br',

            'shift_enter_mode' => 'br',

            'font_format' => 'p;div;pre;h2;h3;h4;h5;h6',

            'font_format' => 'p;h2;h3;h4;h5',

            'custom_formatting' => 't',

            'formatting' => array(

              'custom_formatting_options' => array(

    @@ -58,9 +58,10 @@ function bear_necessities_ckeditor_profile_defaults() {
  
            'html_entities' => 'f',

            'scayt_autoStartup' => 't',

            'theme_config_js' => 'f',

            'js_conf' => 'config.fillEmptyBlocks = false;

    config.tabSpaces = 0;

    config.autoParagraph = false;',

            'js_conf' => 'config.fillEmptyBlocks = false;

    config.tabSpaces = 0;

    config.autoParagraph = false;

    config.scayt_autoStartup = true;',

            'loadPlugins' => array(

              'asset' => array(

                'name' => 'asset',

    @@ -142,21 +143,16 @@ config.autoParagraph = false;',
  
          'settings' => array(

            'ss' => 2,

            'toolbar' => '[

        [\'Source\'],

        [\'Cut\',\'Copy\',\'Paste\',\'PasteText\',\'PasteFromWord\',\'-\',\'SpellChecker\',\'Scayt\'],

        [\'Undo\',\'Redo\',\'Find\',\'Replace\',\'-\',\'SelectAll\'],

        [\'Image\',\'Flash\',\'Table\',\'HorizontalRule\',\'Smiley\',\'SpecialChar\',\'Iframe\'],

        \'/\',

        [\'Bold\',\'Italic\',\'Underline\',\'Strike\',\'-\',\'Subscript\',\'Superscript\',\'-\',\'RemoveFormat\'],

        [\'NumberedList\',\'BulletedList\',\'-\',\'Outdent\',\'Indent\',\'Blockquote\',\'CreateDiv\'],

        [\'JustifyLeft\',\'JustifyCenter\',\'JustifyRight\',\'JustifyBlock\',\'-\',\'BidiLtr\',\'BidiRtl\',\'-\',\'Language\'],

        [\'Link\',\'Unlink\',\'Anchor\'],

        [\'Format\'],

        [\'NumberedList\',\'BulletedList\',\'Blockquote\',\'Table\'],

        [\'JustifyLeft\',\'JustifyCenter\',\'JustifyRight\'],

        \'/\',

        [\'Format\',\'Font\',\'FontSize\'],

        [\'TextColor\',\'BGColor\'],

        [\'Maximize\',\'ShowBlocks\'],

        [\'DrupalBreak\'],

        [\'asset_document\',\'asset_image\',\'asset_embed\',\'assetSearch\']

        [\'PasteText\',\'PasteFromWord\',\'-\',\'Scayt\'],

        [\'Undo\',\'Redo\',\'-\',\'SelectAll\'],

        [\'Maximize\'],

        [\'asset_document\',\'asset_image\',\'asset_embed\',\'assetSearch\'],

        [\'Source\']

    ]',

            'expand' => 't',

            'default' => 't',

    @@ -198,7 +194,8 @@ config.autoParagraph = false;',
  
            'html_entities' => 'f',

            'scayt_autoStartup' => 'f',

            'theme_config_js' => 'f',

            'js_conf' => '',

            'js_conf' => 'config.allowedContent = true;

    config.scayt_autoStartup = true;',

            'loadPlugins' => array(

              'asset' => array(

                'name' => 'asset',

modules/bear_necessities/bear_necessities.module

-Original file line number
+Diff line change
@@ Expand Up @@
         // Set publishing options.
         $form['workflow']['node_options']['#default_value'] = array('status', 'revision');
+        // Unset 'promote to frontpage' and 'make sticky' options.
+        unset($form['workflow']['node_options']['#options']['promote']);
+        unset($form['workflow']['node_options']['#options']['sticky']);
         // Unset display author information.
         $form['display']['node_submitted']['#default_value'] = FALSE;
@@ Expand Down @@

patches.make

-Original file line number
+Diff line change
@@ -1,24 +1,31 @@
     ; This patches.make file is used by https://bitbucket.org/davereid/drush-patchfile
     ; Our project contains patches for both Drupal core and contrib modules/themes.
+    ; When a page has multilple URL aliases, treat one as canonical.
     ; @see https://www.drupal.org/node/1934086#comment-7137850
     projects[drupal][patch][] = "http://drupal.org/files/drupal-1934086-path_load_order-1.patch"
+    ; When a page has multiple menu items, treat one as canonical.
     ; @see https://www.drupal.org/node/1875824#comment-7420862
     projects[drupal][patch][] = "http://drupal.org/files/core-1875824-3-d7.patch"
+    ; Prevent AJAX errors on autocompletes.
     ; @see https://www.drupal.org/node/1232416#comment-8262487
     projects[drupal][patch][] = "http://drupal.org/files/issues/fix_for_autocomplete_terminated_error-1232416-156.patch"
+    ; Fix a PHP notice relating to file uploads.
     ; @see https://www.drupal.org/node/1903010#comment-8415695
     projects[drupal][patch][] = "http://drupal.org/files/issues/drupal-undefinedindex_fileupload-1903010-4.patch"
+    ; When configuring fields with a cardinality > 1, provide an option to not use drag and drop tables.
     ; @see https://www.drupal.org/node/2264739
     projects[drupal][patch][] = "http://drupal.org/files/issues/death-to-tabledrag.patch"
+    ; Allow schema-relative URLs.
     ; @see https://www.drupal.org/node/1783278#comment-9735933
      projects[drupal][patch][] = "https://www.drupal.org/files/issues/schema-relative-1783278-17-D7-do-not-test.patch"
+    ; Prevent alter hooks from making Features appear as overridden.
     ; @see https://www.drupal.org/node/766264#comment-8818877
     projects[features][patch][] = "http://www.drupal.org/files/issues/alter_overrides-766264-45.patch"
@@ Expand Down @@

profile-build.sh

-Original file line number
+Diff line change
@@ -0,0 +1,41 @@
+    #!/bin/bash
+    PROFILE_NAME='bear'
+    MAKE_FILE=''
+    SRC_DIR='/src'
+    DESTINATION='/var/www/html'
+    function checkMakeFile() {
+      # Matches the following:
+      #  projects[bear]
+      #  projects[] = 'bear'
+      #  projects[] = "bear"
+      #  projects[] = bear
+      #  projects[]=bear
+      if grep "\[$PROFILE_NAME\]" $1 > /dev/null || grep "['\"]\?$PROFILE_NAME['\"]\?$" $1 > /dev/null; then
+          echo 'Error: Project should not be listed in make file.' >&2
+          exit 1
+      fi
+      return
+    }
+    if [ "$SRC_DIR/$MAKE_FILE" != '' ] && [ -f "$SRC_DIR/$MAKE_FILE" ]; then
+      checkMakeFile "$SRC_DIR/$MAKE_FILE"
+      drush make "$SRC_DIR/$MAKE_FILE" $DESTINATION
+    elif [ -f "$SRC_DIR/drupal-org-core.make" ] && [ -f "$SRC_DIR/drupal-org.make" ]; then
+      checkMakeFile "$SRC_DIR/drupal-org-core.make"
+      checkMakeFile "$SRC_DIR/drupal-org.make"
+      drush make "$SRC_DIR/drupal-org-core.make" $DESTINATION
+      cd $SRC_DIR
+      drush make "drupal-org.make" --contrib-destination=. --no-core . -y
+      cd -
+    fi
+    if [ ! -d "$DESTINATION/profiles/$PROFILE_NAME" ]; then
+      cp -r $SRC_DIR "$DESTINATION/profiles/$PROFILE_NAME"
+    else
+      echo 'Error: Unable to copy profile to destination because it already exists.' >&2
+      exit 1
+    fi

tests/README.txt

            
                      Original file line number
                      Diff line number
                      Diff line change
                  
    @@ -1,26 +1,28 @@
  
    To set up test framework, run composer install in this directory.

    To Run Behat Tests in your VM:

    ------------------------------

    Follow these steps first to set up behat on your VM.

    After the installer runs, add your site to your machine's hosts file so the tests will be able to interact with the site.

    1. To set up test framework, in this directory run: composer install

    Edit behat.yml to set the base_url and webroot properly.

    2. If you are runnning this on a virtual machine, add your local site to your vm's hosts file so the tests will be able to interact with the site. Verify that your machine can resolve the domain by pinging it.

    If you do not have Selenium setup, you can only run tests with Goutte, which means tests will not use Javascript.

    To run only tests that don't require Javascript, use:

        bin/behat --tags "~@javascript"

    3. Edit behat.yml to set the base_url and webroot properly.

    4. If you do not have Selenium setup, you can only run tests with Goutte, which means tests will not use Javascript. To run only tests that don't require Javascript, use: bin/behat --tags "~@javascript"

    The tests must be run from the machine hosting the site.

    To run tests with Selenium (tests with '@javascript' tag):

      wget http://selenium.googlecode.com/files/selenium-server-standalone-2.44.0.jar

        [May need to visit the website to determine the latest Selenium version]

      sudo apt-get install xvfb

      We need an older version of firefox, but we also need dependencies, so first: sudo apt-get install firefox

      Then remove it (the dependencies will stay though): sudo apt-get remove firefox

      Now get the older version:

      wget https://ftp.mozilla.org/pub/mozilla.org/firefox/releases/31.0/linux-i686/en-US/firefox-31.0.tar.bz2

      tar xvf firefox-31.0.tar.bz2

      Move the extracted firefox directory: mv firefox/ /opt/

      sudo ln -s /opt/firefox/firefox /usr/bin/firefox

      xvfb-run firefox to test that firefox works. You may get an error: Xlib:  extension "RANDR" missing on display ":99". That's safe to ignore.

      xvfb-run java -jar selenium-server-standalone-2.45.0.jar

      Run behat tests in another terminal window

    To Run Javascript Tests:

    ------------------------

    To run tests with Selenium (tests with '@javascript' tag).

    1. Go to http://docs.seleniumhq.org/download/ and download the latest Selenium Standalone Server (currently ver. 2.48.2)

    2. To install the X virtual framebuffer, run: sudo apt-get install xvfb

    3. To install latest version of Firefox, run: sudo apt-get install firefox

    4. Run the Selenium .jar file:  xvfb-run java -jar selenium-server-standalone-2.48.2.jar

    You will need to keep this window open when running javascript tests, so run the behat tests in a new tab. Make sure to stop running the file and close the tab when you are done.

tests/behat.yml

            
                      Original file line number
                      Diff line number
                      Diff line change
                  
    @@ -1,35 +1,39 @@
  
    default:

      #suites:

      #  default:

      #    contexts:

      #      - FeatureContext

      #      - Drupal\DrupalExtension\Context\DrupalContext

      #      - Drupal\DrupalExtension\Context\MinkContext

      suites:

        default:

          contexts:

            - FeatureContext

            - Drupal\DrupalExtension\Context\DrupalContext

            - Drupal\DrupalExtension\Context\MinkContext

            - Drupal\DrupalExtension\Context\MessageContext

            - Drupal\DrupalExtension\Context\DrushContext

      extensions:

        Behat\MinkExtension\Extension:

        Behat\MinkExtension:

          goutte: ~

          selenium2: ~

          base_url: http://bear_updates.local

        Drupal\DrupalExtension\Extension:

          base_url: http://beartests.local

        Drupal\DrupalExtension:

          blackbox: ~

          api_driver: 'drupal'

          drush:

            alias: 'local'

          drupal:

            drupal_root: '/var/www/bear_updates/webroot'

            drupal_root: '/var/www/beartests/webroot'

    probo:

      #suites:

      #  default:

      #    contexts:

      #      - FeatureContext

      #      - Drupal\DrupalExtension\Context\DrupalContext

      #      - Drupal\DrupalExtension\Context\MinkContext

      suites:

         default:

           contexts:

             - FeatureContext

             - Drupal\DrupalExtension\Context\DrupalContext

             - Drupal\DrupalExtension\Context\MinkContext

             - Drupal\DrupalExtension\Context\MessageContext

             - Drupal\DrupalExtension\Context\DrushContext

      extensions:

        Behat\MinkExtension\Extension:

        Behat\MinkExtension:

          goutte: ~

          selenium2: ~

          base_url: http://localhost

        Drupal\DrupalExtension\Extension:

        Drupal\DrupalExtension:

          blackbox: ~

          api_driver: 'drupal'

          drush:

tests/composer.json

-Original file line number
+Diff line change
@@ -1,18 +1,6 @@
     {
       "require": {
-        "drupal/drupal-extension": "1.0.2",
-        "symfony/css-selector": "2.4.2",
-        "symfony/finder": "2.4.2",
-        "symfony/yaml": "2.4.2",
-        "symfony/translation": "2.4.2",
-        "symfony/event-dispatcher": "2.4.2",
-        "symfony/filesystem": "2.4.2",
-        "symfony/config": "2.4.2",
-        "symfony/console": "2.4.2",
-        "symfony/process": "2.4.2",
-        "symfony/dom-crawler": "2.4.2",
-        "symfony/browser-kit": "2.4.2"
+        "drupal/drupal-extension": "~3.0"
       },
       "config": {
         "bin-dir": "bin/"
@@ Expand Down @@

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Adding demo file so that PR can be created for Probo. #44

Uh oh!

Diff view

Diff view

There are no files selected for viewing

Uh oh!

Adding demo file so that PR can be created for Probo. #44

Are you sure you want to change the base?

Uh oh!

Adding demo file so that PR can be created for Probo. #44

Uh oh!

Uh oh!

Diff view

Diff view

There are no files selected for viewing

Uh oh!