Update Composer, update everything
This commit is contained in:
Oliver Davies
parent
ea3e94409f
commit
dda5c284b6
19527 changed files with 1135420 additions and 351004 deletions
|
|
@ -32,6 +32,7 @@
|
|||
top: 0;
|
||||
left: 0;
|
||||
}
|
||||
|
||||
@media only screen and (max-width: 767px) {
|
||||
.joyride-tip-guide {
|
||||
width: 85%;
|
||||
|
|
|
|||
278
web/core/modules/tour/js/tour.es6.js
Normal file
278
web/core/modules/tour/js/tour.es6.js
Normal file
|
|
@ -0,0 +1,278 @@
|
|||
/**
|
||||
* @file
|
||||
* Attaches behaviors for the Tour module's toolbar tab.
|
||||
*/
|
||||
|
||||
(function($, Backbone, Drupal, document) {
|
||||
const queryString = decodeURI(window.location.search);
|
||||
|
||||
/**
|
||||
* Attaches the tour's toolbar tab behavior.
|
||||
*
|
||||
* It uses the query string for:
|
||||
* - tour: When ?tour=1 is present, the tour will start automatically after
|
||||
* the page has loaded.
|
||||
* - tips: Pass ?tips=class in the url to filter the available tips to the
|
||||
* subset which match the given class.
|
||||
*
|
||||
* @example
|
||||
* http://example.com/foo?tour=1&tips=bar
|
||||
*
|
||||
* @type {Drupal~behavior}
|
||||
*
|
||||
* @prop {Drupal~behaviorAttach} attach
|
||||
* Attach tour functionality on `tour` events.
|
||||
*/
|
||||
Drupal.behaviors.tour = {
|
||||
attach(context) {
|
||||
$('body')
|
||||
.once('tour')
|
||||
.each(() => {
|
||||
const model = new Drupal.tour.models.StateModel();
|
||||
new Drupal.tour.views.ToggleTourView({
|
||||
el: $(context).find('#toolbar-tab-tour'),
|
||||
model,
|
||||
});
|
||||
|
||||
model
|
||||
// Allow other scripts to respond to tour events.
|
||||
.on('change:isActive', (model, isActive) => {
|
||||
$(document).trigger(
|
||||
isActive ? 'drupalTourStarted' : 'drupalTourStopped',
|
||||
);
|
||||
})
|
||||
// Initialization: check whether a tour is available on the current
|
||||
// page.
|
||||
.set('tour', $(context).find('ol#tour'));
|
||||
|
||||
// Start the tour immediately if toggled via query string.
|
||||
if (/tour=?/i.test(queryString)) {
|
||||
model.set('isActive', true);
|
||||
}
|
||||
});
|
||||
},
|
||||
};
|
||||
|
||||
/**
|
||||
* @namespace
|
||||
*/
|
||||
Drupal.tour = Drupal.tour || {
|
||||
/**
|
||||
* @namespace Drupal.tour.models
|
||||
*/
|
||||
models: {},
|
||||
|
||||
/**
|
||||
* @namespace Drupal.tour.views
|
||||
*/
|
||||
views: {},
|
||||
};
|
||||
|
||||
/**
|
||||
* Backbone Model for tours.
|
||||
*
|
||||
* @constructor
|
||||
*
|
||||
* @augments Backbone.Model
|
||||
*/
|
||||
Drupal.tour.models.StateModel = Backbone.Model.extend(
|
||||
/** @lends Drupal.tour.models.StateModel# */ {
|
||||
/**
|
||||
* @type {object}
|
||||
*/
|
||||
defaults: /** @lends Drupal.tour.models.StateModel# */ {
|
||||
/**
|
||||
* Indicates whether the Drupal root window has a tour.
|
||||
*
|
||||
* @type {Array}
|
||||
*/
|
||||
tour: [],
|
||||
|
||||
/**
|
||||
* Indicates whether the tour is currently running.
|
||||
*
|
||||
* @type {bool}
|
||||
*/
|
||||
isActive: false,
|
||||
|
||||
/**
|
||||
* Indicates which tour is the active one (necessary to cleanly stop).
|
||||
*
|
||||
* @type {Array}
|
||||
*/
|
||||
activeTour: [],
|
||||
},
|
||||
},
|
||||
);
|
||||
|
||||
Drupal.tour.views.ToggleTourView = Backbone.View.extend(
|
||||
/** @lends Drupal.tour.views.ToggleTourView# */ {
|
||||
/**
|
||||
* @type {object}
|
||||
*/
|
||||
events: { click: 'onClick' },
|
||||
|
||||
/**
|
||||
* Handles edit mode toggle interactions.
|
||||
*
|
||||
* @constructs
|
||||
*
|
||||
* @augments Backbone.View
|
||||
*/
|
||||
initialize() {
|
||||
this.listenTo(this.model, 'change:tour change:isActive', this.render);
|
||||
this.listenTo(this.model, 'change:isActive', this.toggleTour);
|
||||
},
|
||||
|
||||
/**
|
||||
* @inheritdoc
|
||||
*
|
||||
* @return {Drupal.tour.views.ToggleTourView}
|
||||
* The `ToggleTourView` view.
|
||||
*/
|
||||
render() {
|
||||
// Render the visibility.
|
||||
this.$el.toggleClass('hidden', this._getTour().length === 0);
|
||||
// Render the state.
|
||||
const isActive = this.model.get('isActive');
|
||||
this.$el
|
||||
.find('button')
|
||||
.toggleClass('is-active', isActive)
|
||||
.prop('aria-pressed', isActive);
|
||||
return this;
|
||||
},
|
||||
|
||||
/**
|
||||
* Model change handler; starts or stops the tour.
|
||||
*/
|
||||
toggleTour() {
|
||||
if (this.model.get('isActive')) {
|
||||
const $tour = this._getTour();
|
||||
this._removeIrrelevantTourItems($tour, this._getDocument());
|
||||
const that = this;
|
||||
const close = Drupal.t('Close');
|
||||
if ($tour.find('li').length) {
|
||||
$tour.joyride({
|
||||
autoStart: true,
|
||||
postRideCallback() {
|
||||
that.model.set('isActive', false);
|
||||
},
|
||||
// HTML segments for tip layout.
|
||||
template: {
|
||||
link: `<a href="#close" class="joyride-close-tip" aria-label="${close}">×</a>`,
|
||||
button:
|
||||
'<a href="#" class="button button--primary joyride-next-tip"></a>',
|
||||
},
|
||||
});
|
||||
this.model.set({ isActive: true, activeTour: $tour });
|
||||
}
|
||||
} else {
|
||||
this.model.get('activeTour').joyride('destroy');
|
||||
this.model.set({ isActive: false, activeTour: [] });
|
||||
}
|
||||
},
|
||||
|
||||
/**
|
||||
* Toolbar tab click event handler; toggles isActive.
|
||||
*
|
||||
* @param {jQuery.Event} event
|
||||
* The click event.
|
||||
*/
|
||||
onClick(event) {
|
||||
this.model.set('isActive', !this.model.get('isActive'));
|
||||
event.preventDefault();
|
||||
event.stopPropagation();
|
||||
},
|
||||
|
||||
/**
|
||||
* Gets the tour.
|
||||
*
|
||||
* @return {jQuery}
|
||||
* A jQuery element pointing to a `<ol>` containing tour items.
|
||||
*/
|
||||
_getTour() {
|
||||
return this.model.get('tour');
|
||||
},
|
||||
|
||||
/**
|
||||
* Gets the relevant document as a jQuery element.
|
||||
*
|
||||
* @return {jQuery}
|
||||
* A jQuery element pointing to the document within which a tour would be
|
||||
* started given the current state.
|
||||
*/
|
||||
_getDocument() {
|
||||
return $(document);
|
||||
},
|
||||
|
||||
/**
|
||||
* Removes tour items for elements that don't have matching page elements.
|
||||
*
|
||||
* Or that are explicitly filtered out via the 'tips' query string.
|
||||
*
|
||||
* @example
|
||||
* <caption>This will filter out tips that do not have a matching
|
||||
* page element or don't have the "bar" class.</caption>
|
||||
* http://example.com/foo?tips=bar
|
||||
*
|
||||
* @param {jQuery} $tour
|
||||
* A jQuery element pointing to a `<ol>` containing tour items.
|
||||
* @param {jQuery} $document
|
||||
* A jQuery element pointing to the document within which the elements
|
||||
* should be sought.
|
||||
*
|
||||
* @see Drupal.tour.views.ToggleTourView#_getDocument
|
||||
*/
|
||||
_removeIrrelevantTourItems($tour, $document) {
|
||||
let removals = false;
|
||||
const tips = /tips=([^&]+)/.exec(queryString);
|
||||
$tour.find('li').each(function() {
|
||||
const $this = $(this);
|
||||
const itemId = $this.attr('data-id');
|
||||
const itemClass = $this.attr('data-class');
|
||||
// If the query parameter 'tips' is set, remove all tips that don't
|
||||
// have the matching class.
|
||||
if (tips && !$(this).hasClass(tips[1])) {
|
||||
removals = true;
|
||||
$this.remove();
|
||||
return;
|
||||
}
|
||||
// Remove tip from the DOM if there is no corresponding page element.
|
||||
if (
|
||||
(!itemId && !itemClass) ||
|
||||
(itemId && $document.find(`#${itemId}`).length) ||
|
||||
(itemClass && $document.find(`.${itemClass}`).length)
|
||||
) {
|
||||
return;
|
||||
}
|
||||
removals = true;
|
||||
$this.remove();
|
||||
});
|
||||
|
||||
// If there were removals, we'll have to do some clean-up.
|
||||
if (removals) {
|
||||
const total = $tour.find('li').length;
|
||||
if (!total) {
|
||||
this.model.set({ tour: [] });
|
||||
}
|
||||
|
||||
$tour
|
||||
.find('li')
|
||||
// Rebuild the progress data.
|
||||
.each(function(index) {
|
||||
const progress = Drupal.t('!tour_item of !total', {
|
||||
'!tour_item': index + 1,
|
||||
'!total': total,
|
||||
});
|
||||
$(this)
|
||||
.find('.tour-progress')
|
||||
.text(progress);
|
||||
})
|
||||
// Update the last item to have "End tour" as the button.
|
||||
.eq(-1)
|
||||
.attr('data-text', Drupal.t('End tour'));
|
||||
}
|
||||
},
|
||||
},
|
||||
);
|
||||
})(jQuery, Backbone, Drupal, document);
|
||||
|
|
@ -1,33 +1,15 @@
|
|||
/**
|
||||
* @file
|
||||
* Attaches behaviors for the Tour module's toolbar tab.
|
||||
*/
|
||||
* DO NOT EDIT THIS FILE.
|
||||
* See the following change record for more information,
|
||||
* https://www.drupal.org/node/2815083
|
||||
* @preserve
|
||||
**/
|
||||
|
||||
(function ($, Backbone, Drupal, document) {
|
||||
|
||||
'use strict';
|
||||
|
||||
var queryString = decodeURI(window.location.search);
|
||||
|
||||
/**
|
||||
* Attaches the tour's toolbar tab behavior.
|
||||
*
|
||||
* It uses the query string for:
|
||||
* - tour: When ?tour=1 is present, the tour will start automatically after
|
||||
* the page has loaded.
|
||||
* - tips: Pass ?tips=class in the url to filter the available tips to the
|
||||
* subset which match the given class.
|
||||
*
|
||||
* @example
|
||||
* http://example.com/foo?tour=1&tips=bar
|
||||
*
|
||||
* @type {Drupal~behavior}
|
||||
*
|
||||
* @prop {Drupal~behaviorAttach} attach
|
||||
* Attach tour functionality on `tour` events.
|
||||
*/
|
||||
Drupal.behaviors.tour = {
|
||||
attach: function (context) {
|
||||
attach: function attach(context) {
|
||||
$('body').once('tour').each(function () {
|
||||
var model = new Drupal.tour.models.StateModel();
|
||||
new Drupal.tour.views.ToggleTourView({
|
||||
|
|
@ -35,16 +17,10 @@
|
|||
model: model
|
||||
});
|
||||
|
||||
model
|
||||
// Allow other scripts to respond to tour events.
|
||||
.on('change:isActive', function (model, isActive) {
|
||||
$(document).trigger((isActive) ? 'drupalTourStarted' : 'drupalTourStopped');
|
||||
})
|
||||
// Initialization: check whether a tour is available on the current
|
||||
// page.
|
||||
.set('tour', $(context).find('ol#tour'));
|
||||
model.on('change:isActive', function (model, isActive) {
|
||||
$(document).trigger(isActive ? 'drupalTourStarted' : 'drupalTourStopped');
|
||||
}).set('tour', $(context).find('ol#tour'));
|
||||
|
||||
// Start the tour immediately if toggled via query string.
|
||||
if (/tour=?/i.test(queryString)) {
|
||||
model.set('isActive', true);
|
||||
}
|
||||
|
|
@ -52,219 +28,107 @@
|
|||
}
|
||||
};
|
||||
|
||||
/**
|
||||
* @namespace
|
||||
*/
|
||||
Drupal.tour = Drupal.tour || {
|
||||
|
||||
/**
|
||||
* @namespace Drupal.tour.models
|
||||
*/
|
||||
models: {},
|
||||
|
||||
/**
|
||||
* @namespace Drupal.tour.views
|
||||
*/
|
||||
views: {}
|
||||
};
|
||||
|
||||
/**
|
||||
* Backbone Model for tours.
|
||||
*
|
||||
* @constructor
|
||||
*
|
||||
* @augments Backbone.Model
|
||||
*/
|
||||
Drupal.tour.models.StateModel = Backbone.Model.extend(/** @lends Drupal.tour.models.StateModel# */{
|
||||
|
||||
/**
|
||||
* @type {object}
|
||||
*/
|
||||
defaults: /** @lends Drupal.tour.models.StateModel# */{
|
||||
|
||||
/**
|
||||
* Indicates whether the Drupal root window has a tour.
|
||||
*
|
||||
* @type {Array}
|
||||
*/
|
||||
Drupal.tour.models.StateModel = Backbone.Model.extend({
|
||||
defaults: {
|
||||
tour: [],
|
||||
|
||||
/**
|
||||
* Indicates whether the tour is currently running.
|
||||
*
|
||||
* @type {bool}
|
||||
*/
|
||||
isActive: false,
|
||||
|
||||
/**
|
||||
* Indicates which tour is the active one (necessary to cleanly stop).
|
||||
*
|
||||
* @type {Array}
|
||||
*/
|
||||
activeTour: []
|
||||
}
|
||||
});
|
||||
|
||||
Drupal.tour.views.ToggleTourView = Backbone.View.extend(/** @lends Drupal.tour.views.ToggleTourView# */{
|
||||
Drupal.tour.views.ToggleTourView = Backbone.View.extend({
|
||||
events: { click: 'onClick' },
|
||||
|
||||
/**
|
||||
* @type {object}
|
||||
*/
|
||||
events: {click: 'onClick'},
|
||||
|
||||
/**
|
||||
* Handles edit mode toggle interactions.
|
||||
*
|
||||
* @constructs
|
||||
*
|
||||
* @augments Backbone.View
|
||||
*/
|
||||
initialize: function () {
|
||||
initialize: function initialize() {
|
||||
this.listenTo(this.model, 'change:tour change:isActive', this.render);
|
||||
this.listenTo(this.model, 'change:isActive', this.toggleTour);
|
||||
},
|
||||
|
||||
/**
|
||||
* @inheritdoc
|
||||
*
|
||||
* @return {Drupal.tour.views.ToggleTourView}
|
||||
* The `ToggleTourView` view.
|
||||
*/
|
||||
render: function () {
|
||||
// Render the visibility.
|
||||
render: function render() {
|
||||
this.$el.toggleClass('hidden', this._getTour().length === 0);
|
||||
// Render the state.
|
||||
|
||||
var isActive = this.model.get('isActive');
|
||||
this.$el.find('button')
|
||||
.toggleClass('is-active', isActive)
|
||||
.prop('aria-pressed', isActive);
|
||||
this.$el.find('button').toggleClass('is-active', isActive).prop('aria-pressed', isActive);
|
||||
return this;
|
||||
},
|
||||
|
||||
/**
|
||||
* Model change handler; starts or stops the tour.
|
||||
*/
|
||||
toggleTour: function () {
|
||||
toggleTour: function toggleTour() {
|
||||
if (this.model.get('isActive')) {
|
||||
var $tour = this._getTour();
|
||||
this._removeIrrelevantTourItems($tour, this._getDocument());
|
||||
var that = this;
|
||||
var close = Drupal.t('Close');
|
||||
if ($tour.find('li').length) {
|
||||
$tour.joyride({
|
||||
autoStart: true,
|
||||
postRideCallback: function () { that.model.set('isActive', false); },
|
||||
// HTML segments for tip layout.
|
||||
postRideCallback: function postRideCallback() {
|
||||
that.model.set('isActive', false);
|
||||
},
|
||||
|
||||
template: {
|
||||
link: '<a href=\"#close\" class=\"joyride-close-tip\">×</a>',
|
||||
button: '<a href=\"#\" class=\"button button--primary joyride-next-tip\"></a>'
|
||||
link: '<a href="#close" class="joyride-close-tip" aria-label="' + close + '">×</a>',
|
||||
button: '<a href="#" class="button button--primary joyride-next-tip"></a>'
|
||||
}
|
||||
});
|
||||
this.model.set({isActive: true, activeTour: $tour});
|
||||
this.model.set({ isActive: true, activeTour: $tour });
|
||||
}
|
||||
}
|
||||
else {
|
||||
} else {
|
||||
this.model.get('activeTour').joyride('destroy');
|
||||
this.model.set({isActive: false, activeTour: []});
|
||||
this.model.set({ isActive: false, activeTour: [] });
|
||||
}
|
||||
},
|
||||
|
||||
/**
|
||||
* Toolbar tab click event handler; toggles isActive.
|
||||
*
|
||||
* @param {jQuery.Event} event
|
||||
* The click event.
|
||||
*/
|
||||
onClick: function (event) {
|
||||
onClick: function onClick(event) {
|
||||
this.model.set('isActive', !this.model.get('isActive'));
|
||||
event.preventDefault();
|
||||
event.stopPropagation();
|
||||
},
|
||||
|
||||
/**
|
||||
* Gets the tour.
|
||||
*
|
||||
* @return {jQuery}
|
||||
* A jQuery element pointing to a `<ol>` containing tour items.
|
||||
*/
|
||||
_getTour: function () {
|
||||
_getTour: function _getTour() {
|
||||
return this.model.get('tour');
|
||||
},
|
||||
|
||||
/**
|
||||
* Gets the relevant document as a jQuery element.
|
||||
*
|
||||
* @return {jQuery}
|
||||
* A jQuery element pointing to the document within which a tour would be
|
||||
* started given the current state.
|
||||
*/
|
||||
_getDocument: function () {
|
||||
_getDocument: function _getDocument() {
|
||||
return $(document);
|
||||
},
|
||||
|
||||
/**
|
||||
* Removes tour items for elements that don't have matching page elements.
|
||||
*
|
||||
* Or that are explicitly filtered out via the 'tips' query string.
|
||||
*
|
||||
* @example
|
||||
* <caption>This will filter out tips that do not have a matching
|
||||
* page element or don't have the "bar" class.</caption>
|
||||
* http://example.com/foo?tips=bar
|
||||
*
|
||||
* @param {jQuery} $tour
|
||||
* A jQuery element pointing to a `<ol>` containing tour items.
|
||||
* @param {jQuery} $document
|
||||
* A jQuery element pointing to the document within which the elements
|
||||
* should be sought.
|
||||
*
|
||||
* @see Drupal.tour.views.ToggleTourView#_getDocument
|
||||
*/
|
||||
_removeIrrelevantTourItems: function ($tour, $document) {
|
||||
_removeIrrelevantTourItems: function _removeIrrelevantTourItems($tour, $document) {
|
||||
var removals = false;
|
||||
var tips = /tips=([^&]+)/.exec(queryString);
|
||||
$tour
|
||||
.find('li')
|
||||
.each(function () {
|
||||
var $this = $(this);
|
||||
var itemId = $this.attr('data-id');
|
||||
var itemClass = $this.attr('data-class');
|
||||
// If the query parameter 'tips' is set, remove all tips that don't
|
||||
// have the matching class.
|
||||
if (tips && !$(this).hasClass(tips[1])) {
|
||||
removals = true;
|
||||
$this.remove();
|
||||
return;
|
||||
}
|
||||
// Remove tip from the DOM if there is no corresponding page element.
|
||||
if ((!itemId && !itemClass) ||
|
||||
(itemId && $document.find('#' + itemId).length) ||
|
||||
(itemClass && $document.find('.' + itemClass).length)) {
|
||||
return;
|
||||
}
|
||||
$tour.find('li').each(function () {
|
||||
var $this = $(this);
|
||||
var itemId = $this.attr('data-id');
|
||||
var itemClass = $this.attr('data-class');
|
||||
|
||||
if (tips && !$(this).hasClass(tips[1])) {
|
||||
removals = true;
|
||||
$this.remove();
|
||||
});
|
||||
return;
|
||||
}
|
||||
|
||||
if (!itemId && !itemClass || itemId && $document.find('#' + itemId).length || itemClass && $document.find('.' + itemClass).length) {
|
||||
return;
|
||||
}
|
||||
removals = true;
|
||||
$this.remove();
|
||||
});
|
||||
|
||||
// If there were removals, we'll have to do some clean-up.
|
||||
if (removals) {
|
||||
var total = $tour.find('li').length;
|
||||
if (!total) {
|
||||
this.model.set({tour: []});
|
||||
this.model.set({ tour: [] });
|
||||
}
|
||||
|
||||
$tour
|
||||
.find('li')
|
||||
// Rebuild the progress data.
|
||||
.each(function (index) {
|
||||
var progress = Drupal.t('!tour_item of !total', {'!tour_item': index + 1, '!total': total});
|
||||
$(this).find('.tour-progress').text(progress);
|
||||
})
|
||||
// Update the last item to have "End tour" as the button.
|
||||
.eq(-1)
|
||||
.attr('data-text', Drupal.t('End tour'));
|
||||
$tour.find('li').each(function (index) {
|
||||
var progress = Drupal.t('!tour_item of !total', {
|
||||
'!tour_item': index + 1,
|
||||
'!total': total
|
||||
});
|
||||
$(this).find('.tour-progress').text(progress);
|
||||
}).eq(-1).attr('data-text', Drupal.t('End tour'));
|
||||
}
|
||||
}
|
||||
|
||||
});
|
||||
|
||||
})(jQuery, Backbone, Drupal, document);
|
||||
})(jQuery, Backbone, Drupal, document);
|
||||
|
|
@ -12,9 +12,18 @@ use Drupal\tour\TourInterface;
|
|||
* @ConfigEntityType(
|
||||
* id = "tour",
|
||||
* label = @Translation("Tour"),
|
||||
* label_collection = @Translation("Tours"),
|
||||
* label_singular = @Translation("tour"),
|
||||
* label_plural = @Translation("tours"),
|
||||
* label_count = @PluralTranslation(
|
||||
* singular = "@count tour",
|
||||
* plural = "@count tours",
|
||||
* ),
|
||||
* handlers = {
|
||||
* "view_builder" = "Drupal\tour\TourViewBuilder"
|
||||
* "view_builder" = "Drupal\tour\TourViewBuilder",
|
||||
* "access" = "Drupal\tour\TourAccessControlHandler",
|
||||
* },
|
||||
* admin_permission = "administer site configuration",
|
||||
* entity_keys = {
|
||||
* "id" = "id",
|
||||
* "label" = "label"
|
||||
|
|
|
|||
|
|
@ -39,6 +39,13 @@ class TipPluginText extends TipPluginBase implements ContainerFactoryPluginInter
|
|||
*/
|
||||
protected $location;
|
||||
|
||||
/**
|
||||
* Unique aria-id.
|
||||
*
|
||||
* @var string
|
||||
*/
|
||||
protected $ariaId;
|
||||
|
||||
/**
|
||||
* Constructs a \Drupal\tour\Plugin\tour\tip\TipPluginText object.
|
||||
*
|
||||
|
|
@ -70,11 +77,10 @@ class TipPluginText extends TipPluginBase implements ContainerFactoryPluginInter
|
|||
* A unique id to be used to generate aria attributes.
|
||||
*/
|
||||
public function getAriaId() {
|
||||
static $id;
|
||||
if (!isset($id)) {
|
||||
$id = Html::getUniqueId($this->get('id'));
|
||||
if (!$this->ariaId) {
|
||||
$this->ariaId = Html::getUniqueId($this->get('id'));
|
||||
}
|
||||
return $id;
|
||||
return $this->ariaId;
|
||||
}
|
||||
|
||||
/**
|
||||
|
|
|
|||
|
|
@ -4,8 +4,13 @@ namespace Drupal\tour\Tests;
|
|||
|
||||
use Drupal\simpletest\WebTestBase;
|
||||
|
||||
@trigger_error('\Drupal\tour\Tests\TourTestBase is deprecated in 8.4.0 and will be removed before Drupal 9.0.0. Instead, use \Drupal\Tests\tour\Functional\TourTestBase.', E_USER_DEPRECATED);
|
||||
|
||||
/**
|
||||
* Base class for testing Tour functionality.
|
||||
*
|
||||
* @deprecated in Drupal 8.4.0 and will be removed before Drupal 9.0.0.
|
||||
* Use \Drupal\Tests\tour\Functional\TourTestBase instead.
|
||||
*/
|
||||
abstract class TourTestBase extends WebTestBase {
|
||||
|
||||
|
|
@ -50,11 +55,11 @@ abstract class TourTestBase extends WebTestBase {
|
|||
$modals = 0;
|
||||
foreach ($tips as $tip) {
|
||||
if (!empty($tip['data-id'])) {
|
||||
$elements = \PHPUnit_Util_XML::cssSelect('#' . $tip['data-id'], TRUE, $this->content, TRUE);
|
||||
$elements = $this->xpath('//*[@id="' . $tip['data-id'] . '"]');
|
||||
$this->assertTrue(!empty($elements) && count($elements) === 1, format_string('Found corresponding page element for tour tip with id #%data-id', ['%data-id' => $tip['data-id']]));
|
||||
}
|
||||
elseif (!empty($tip['data-class'])) {
|
||||
$elements = \PHPUnit_Util_XML::cssSelect('.' . $tip['data-class'], TRUE, $this->content, TRUE);
|
||||
$elements = $this->xpath('//*[contain(@class, "' . $tip['data-id'] . '")]');
|
||||
$this->assertFalse(empty($elements), format_string('Found corresponding page element for tour tip with class .%data-class', ['%data-class' => $tip['data-class']]));
|
||||
}
|
||||
else {
|
||||
|
|
|
|||
28
web/core/modules/tour/src/TourAccessControlHandler.php
Normal file
28
web/core/modules/tour/src/TourAccessControlHandler.php
Normal file
|
|
@ -0,0 +1,28 @@
|
|||
<?php
|
||||
|
||||
namespace Drupal\tour;
|
||||
|
||||
use Drupal\Core\Access\AccessResult;
|
||||
use Drupal\Core\Entity\EntityAccessControlHandler;
|
||||
use Drupal\Core\Entity\EntityInterface;
|
||||
use Drupal\Core\Session\AccountInterface;
|
||||
|
||||
/**
|
||||
* Defines the access control handler for the tour entity type.
|
||||
*
|
||||
* @see \Drupal\tour\Entity\Tour
|
||||
*/
|
||||
class TourAccessControlHandler extends EntityAccessControlHandler {
|
||||
|
||||
/**
|
||||
* {@inheritdoc}
|
||||
*/
|
||||
protected function checkAccess(EntityInterface $entity, $operation, AccountInterface $account) {
|
||||
if ($operation === 'view') {
|
||||
return AccessResult::allowedIfHasPermissions($account, ['access tour', 'administer site configuration'], 'OR');
|
||||
}
|
||||
|
||||
return parent::checkAccess($entity, $operation, $account);
|
||||
}
|
||||
|
||||
}
|
||||
|
|
@ -0,0 +1,30 @@
|
|||
<?php
|
||||
|
||||
namespace Drupal\Tests\tour\Functional\Hal;
|
||||
|
||||
use Drupal\Tests\rest\Functional\AnonResourceTestTrait;
|
||||
use Drupal\Tests\tour\Functional\Rest\TourResourceTestBase;
|
||||
|
||||
/**
|
||||
* @group hal
|
||||
*/
|
||||
class TourHalJsonAnonTest extends TourResourceTestBase {
|
||||
|
||||
use AnonResourceTestTrait;
|
||||
|
||||
/**
|
||||
* {@inheritdoc}
|
||||
*/
|
||||
public static $modules = ['hal'];
|
||||
|
||||
/**
|
||||
* {@inheritdoc}
|
||||
*/
|
||||
protected static $format = 'hal_json';
|
||||
|
||||
/**
|
||||
* {@inheritdoc}
|
||||
*/
|
||||
protected static $mimeType = 'application/hal+json';
|
||||
|
||||
}
|
||||
|
|
@ -0,0 +1,35 @@
|
|||
<?php
|
||||
|
||||
namespace Drupal\Tests\tour\Functional\Hal;
|
||||
|
||||
use Drupal\Tests\rest\Functional\BasicAuthResourceTestTrait;
|
||||
use Drupal\Tests\tour\Functional\Rest\TourResourceTestBase;
|
||||
|
||||
/**
|
||||
* @group hal
|
||||
*/
|
||||
class TourHalJsonBasicAuthTest extends TourResourceTestBase {
|
||||
|
||||
use BasicAuthResourceTestTrait;
|
||||
|
||||
/**
|
||||
* {@inheritdoc}
|
||||
*/
|
||||
public static $modules = ['hal', 'basic_auth'];
|
||||
|
||||
/**
|
||||
* {@inheritdoc}
|
||||
*/
|
||||
protected static $format = 'hal_json';
|
||||
|
||||
/**
|
||||
* {@inheritdoc}
|
||||
*/
|
||||
protected static $mimeType = 'application/hal+json';
|
||||
|
||||
/**
|
||||
* {@inheritdoc}
|
||||
*/
|
||||
protected static $auth = 'basic_auth';
|
||||
|
||||
}
|
||||
|
|
@ -0,0 +1,35 @@
|
|||
<?php
|
||||
|
||||
namespace Drupal\Tests\tour\Functional\Hal;
|
||||
|
||||
use Drupal\Tests\rest\Functional\CookieResourceTestTrait;
|
||||
use Drupal\Tests\tour\Functional\Rest\TourResourceTestBase;
|
||||
|
||||
/**
|
||||
* @group hal
|
||||
*/
|
||||
class TourHalJsonCookieTest extends TourResourceTestBase {
|
||||
|
||||
use CookieResourceTestTrait;
|
||||
|
||||
/**
|
||||
* {@inheritdoc}
|
||||
*/
|
||||
public static $modules = ['hal'];
|
||||
|
||||
/**
|
||||
* {@inheritdoc}
|
||||
*/
|
||||
protected static $format = 'hal_json';
|
||||
|
||||
/**
|
||||
* {@inheritdoc}
|
||||
*/
|
||||
protected static $mimeType = 'application/hal+json';
|
||||
|
||||
/**
|
||||
* {@inheritdoc}
|
||||
*/
|
||||
protected static $auth = 'cookie';
|
||||
|
||||
}
|
||||
|
|
@ -0,0 +1,24 @@
|
|||
<?php
|
||||
|
||||
namespace Drupal\Tests\tour\Functional\Rest;
|
||||
|
||||
use Drupal\Tests\rest\Functional\AnonResourceTestTrait;
|
||||
|
||||
/**
|
||||
* @group rest
|
||||
*/
|
||||
class TourJsonAnonTest extends TourResourceTestBase {
|
||||
|
||||
use AnonResourceTestTrait;
|
||||
|
||||
/**
|
||||
* {@inheritdoc}
|
||||
*/
|
||||
protected static $format = 'json';
|
||||
|
||||
/**
|
||||
* {@inheritdoc}
|
||||
*/
|
||||
protected static $mimeType = 'application/json';
|
||||
|
||||
}
|
||||
|
|
@ -0,0 +1,34 @@
|
|||
<?php
|
||||
|
||||
namespace Drupal\Tests\tour\Functional\Rest;
|
||||
|
||||
use Drupal\Tests\rest\Functional\BasicAuthResourceTestTrait;
|
||||
|
||||
/**
|
||||
* @group rest
|
||||
*/
|
||||
class TourJsonBasicAuthTest extends TourResourceTestBase {
|
||||
|
||||
use BasicAuthResourceTestTrait;
|
||||
|
||||
/**
|
||||
* {@inheritdoc}
|
||||
*/
|
||||
public static $modules = ['basic_auth'];
|
||||
|
||||
/**
|
||||
* {@inheritdoc}
|
||||
*/
|
||||
protected static $format = 'json';
|
||||
|
||||
/**
|
||||
* {@inheritdoc}
|
||||
*/
|
||||
protected static $mimeType = 'application/json';
|
||||
|
||||
/**
|
||||
* {@inheritdoc}
|
||||
*/
|
||||
protected static $auth = 'basic_auth';
|
||||
|
||||
}
|
||||
|
|
@ -0,0 +1,29 @@
|
|||
<?php
|
||||
|
||||
namespace Drupal\Tests\tour\Functional\Rest;
|
||||
|
||||
use Drupal\Tests\rest\Functional\CookieResourceTestTrait;
|
||||
|
||||
/**
|
||||
* @group rest
|
||||
*/
|
||||
class TourJsonCookieTest extends TourResourceTestBase {
|
||||
|
||||
use CookieResourceTestTrait;
|
||||
|
||||
/**
|
||||
* {@inheritdoc}
|
||||
*/
|
||||
protected static $format = 'json';
|
||||
|
||||
/**
|
||||
* {@inheritdoc}
|
||||
*/
|
||||
protected static $mimeType = 'application/json';
|
||||
|
||||
/**
|
||||
* {@inheritdoc}
|
||||
*/
|
||||
protected static $auth = 'cookie';
|
||||
|
||||
}
|
||||
|
|
@ -0,0 +1,123 @@
|
|||
<?php
|
||||
|
||||
namespace Drupal\Tests\tour\Functional\Rest;
|
||||
|
||||
use Drupal\Tests\rest\Functional\EntityResource\EntityResourceTestBase;
|
||||
use Drupal\tour\Entity\Tour;
|
||||
|
||||
abstract class TourResourceTestBase extends EntityResourceTestBase {
|
||||
|
||||
/**
|
||||
* {@inheritdoc}
|
||||
*/
|
||||
public static $modules = ['tour'];
|
||||
|
||||
/**
|
||||
* {@inheritdoc}
|
||||
*/
|
||||
protected static $entityTypeId = 'tour';
|
||||
|
||||
/**
|
||||
* @var \Drupal\tour\TourInterface
|
||||
*/
|
||||
protected $entity;
|
||||
|
||||
/**
|
||||
* {@inheritdoc}
|
||||
*/
|
||||
protected function setUpAuthorization($method) {
|
||||
$this->grantPermissionsToTestedRole(['access tour']);
|
||||
}
|
||||
|
||||
/**
|
||||
* {@inheritdoc}
|
||||
*/
|
||||
protected function createEntity() {
|
||||
$tour = Tour::create([
|
||||
'id' => 'tour-llama',
|
||||
'label' => 'Llama tour',
|
||||
'langcode' => 'en',
|
||||
'module' => 'tour',
|
||||
'routes' => [
|
||||
[
|
||||
'route_name' => '<front>',
|
||||
],
|
||||
],
|
||||
'tips' => [
|
||||
'tour-llama-1' => [
|
||||
'id' => 'tour-llama-1',
|
||||
'plugin' => 'text',
|
||||
'label' => 'Llama',
|
||||
'body' => 'Who handle the awesomeness of llamas?',
|
||||
'weight' => 100,
|
||||
'attributes' => [
|
||||
'data-id' => 'tour-llama-1',
|
||||
],
|
||||
],
|
||||
],
|
||||
]);
|
||||
$tour->save();
|
||||
|
||||
return $tour;
|
||||
}
|
||||
|
||||
/**
|
||||
* {@inheritdoc}
|
||||
*/
|
||||
protected function getExpectedNormalizedEntity() {
|
||||
return [
|
||||
'dependencies' => [],
|
||||
'id' => 'tour-llama',
|
||||
'label' => 'Llama tour',
|
||||
'langcode' => 'en',
|
||||
'module' => 'tour',
|
||||
'routes' => [
|
||||
[
|
||||
'route_name' => '<front>',
|
||||
],
|
||||
],
|
||||
'status' => TRUE,
|
||||
'tips' => [
|
||||
'tour-llama-1' => [
|
||||
'id' => 'tour-llama-1',
|
||||
'plugin' => 'text',
|
||||
'label' => 'Llama',
|
||||
'body' => 'Who handle the awesomeness of llamas?',
|
||||
'weight' => 100,
|
||||
'attributes' => [
|
||||
'data-id' => 'tour-llama-1',
|
||||
],
|
||||
],
|
||||
],
|
||||
'uuid' => $this->entity->uuid(),
|
||||
];
|
||||
}
|
||||
|
||||
/**
|
||||
* {@inheritdoc}
|
||||
*/
|
||||
protected function getNormalizedPostEntity() {
|
||||
// @todo Update in https://www.drupal.org/node/2300677.
|
||||
}
|
||||
|
||||
/**
|
||||
* {@inheritdoc}
|
||||
*/
|
||||
protected function getExpectedCacheContexts() {
|
||||
return [
|
||||
'user.permissions',
|
||||
];
|
||||
}
|
||||
|
||||
/**
|
||||
* {@inheritdoc}
|
||||
*/
|
||||
protected function getExpectedUnauthorizedAccessMessage($method) {
|
||||
if ($this->config('rest.settings')->get('bc_entity_resource_permissions')) {
|
||||
return parent::getExpectedUnauthorizedAccessMessage($method);
|
||||
}
|
||||
|
||||
return "The following permissions are required: 'access tour' OR 'administer site configuration'.";
|
||||
}
|
||||
|
||||
}
|
||||
|
|
@ -0,0 +1,26 @@
|
|||
<?php
|
||||
|
||||
namespace Drupal\Tests\tour\Functional\Rest;
|
||||
|
||||
use Drupal\Tests\rest\Functional\AnonResourceTestTrait;
|
||||
use Drupal\Tests\rest\Functional\EntityResource\XmlEntityNormalizationQuirksTrait;
|
||||
|
||||
/**
|
||||
* @group rest
|
||||
*/
|
||||
class TourXmlAnonTest extends TourResourceTestBase {
|
||||
|
||||
use AnonResourceTestTrait;
|
||||
use XmlEntityNormalizationQuirksTrait;
|
||||
|
||||
/**
|
||||
* {@inheritdoc}
|
||||
*/
|
||||
protected static $format = 'xml';
|
||||
|
||||
/**
|
||||
* {@inheritdoc}
|
||||
*/
|
||||
protected static $mimeType = 'text/xml; charset=UTF-8';
|
||||
|
||||
}
|
||||
|
|
@ -0,0 +1,36 @@
|
|||
<?php
|
||||
|
||||
namespace Drupal\Tests\tour\Functional\Rest;
|
||||
|
||||
use Drupal\Tests\rest\Functional\BasicAuthResourceTestTrait;
|
||||
use Drupal\Tests\rest\Functional\EntityResource\XmlEntityNormalizationQuirksTrait;
|
||||
|
||||
/**
|
||||
* @group rest
|
||||
*/
|
||||
class TourXmlBasicAuthTest extends TourResourceTestBase {
|
||||
|
||||
use BasicAuthResourceTestTrait;
|
||||
use XmlEntityNormalizationQuirksTrait;
|
||||
|
||||
/**
|
||||
* {@inheritdoc}
|
||||
*/
|
||||
public static $modules = ['basic_auth'];
|
||||
|
||||
/**
|
||||
* {@inheritdoc}
|
||||
*/
|
||||
protected static $format = 'xml';
|
||||
|
||||
/**
|
||||
* {@inheritdoc}
|
||||
*/
|
||||
protected static $mimeType = 'text/xml; charset=UTF-8';
|
||||
|
||||
/**
|
||||
* {@inheritdoc}
|
||||
*/
|
||||
protected static $auth = 'basic_auth';
|
||||
|
||||
}
|
||||
|
|
@ -0,0 +1,31 @@
|
|||
<?php
|
||||
|
||||
namespace Drupal\Tests\tour\Functional\Rest;
|
||||
|
||||
use Drupal\Tests\rest\Functional\CookieResourceTestTrait;
|
||||
use Drupal\Tests\rest\Functional\EntityResource\XmlEntityNormalizationQuirksTrait;
|
||||
|
||||
/**
|
||||
* @group rest
|
||||
*/
|
||||
class TourXmlCookieTest extends TourResourceTestBase {
|
||||
|
||||
use CookieResourceTestTrait;
|
||||
use XmlEntityNormalizationQuirksTrait;
|
||||
|
||||
/**
|
||||
* {@inheritdoc}
|
||||
*/
|
||||
protected static $format = 'xml';
|
||||
|
||||
/**
|
||||
* {@inheritdoc}
|
||||
*/
|
||||
protected static $mimeType = 'text/xml; charset=UTF-8';
|
||||
|
||||
/**
|
||||
* {@inheritdoc}
|
||||
*/
|
||||
protected static $auth = 'cookie';
|
||||
|
||||
}
|
||||
|
|
@ -3,7 +3,7 @@
|
|||
namespace Drupal\Tests\tour\Functional;
|
||||
|
||||
use Drupal\Core\Url;
|
||||
use Drupal\system\Tests\Cache\PageCacheTagsTestBase;
|
||||
use Drupal\Tests\system\Functional\Cache\PageCacheTagsTestBase;
|
||||
use Drupal\tour\Entity\Tour;
|
||||
use Drupal\user\Entity\Role;
|
||||
use Drupal\user\RoleInterface;
|
||||
|
|
|
|||
|
|
@ -1,15 +1,15 @@
|
|||
<?php
|
||||
|
||||
namespace Drupal\tour\Tests;
|
||||
namespace Drupal\Tests\tour\Functional;
|
||||
|
||||
use Drupal\simpletest\WebTestBase;
|
||||
use Drupal\Tests\BrowserTestBase;
|
||||
|
||||
/**
|
||||
* Verifies help page display of tours.
|
||||
*
|
||||
* @group help
|
||||
*/
|
||||
class TourHelpPageTest extends WebTestBase {
|
||||
class TourHelpPageTest extends BrowserTestBase {
|
||||
|
||||
/**
|
||||
* Modules to enable, including some providing tours.
|
||||
|
|
@ -101,7 +101,7 @@ class TourHelpPageTest extends WebTestBase {
|
|||
foreach ($titles[1] as $title) {
|
||||
if ($tours_ok) {
|
||||
$this->assertText($title);
|
||||
$this->assertNoLink($title);
|
||||
$this->assertSession()->linkNotExistsExact($title);
|
||||
}
|
||||
else {
|
||||
$this->assertNoText($title);
|
||||
|
|
@ -1,6 +1,6 @@
|
|||
<?php
|
||||
|
||||
namespace Drupal\tour\Tests;
|
||||
namespace Drupal\Tests\tour\Functional;
|
||||
|
||||
use Drupal\language\Entity\ConfigurableLanguage;
|
||||
use Drupal\tour\Entity\Tour;
|
||||
|
|
@ -45,7 +45,7 @@ class TourTest extends TourTestBasic {
|
|||
|
||||
$this->drupalPlaceBlock('local_actions_block', [
|
||||
'theme' => 'seven',
|
||||
'region' => 'content'
|
||||
'region' => 'content',
|
||||
]);
|
||||
}
|
||||
|
||||
|
|
@ -130,7 +130,7 @@ class TourTest extends TourTestBasic {
|
|||
'url' => 'http://local/image.png',
|
||||
'weight' => 1,
|
||||
'attributes' => [
|
||||
'data-id' => 'tour-code-test-2'
|
||||
'data-id' => 'tour-code-test-2',
|
||||
],
|
||||
],
|
||||
],
|
||||
72
web/core/modules/tour/tests/src/Functional/TourTestBase.php
Normal file
72
web/core/modules/tour/tests/src/Functional/TourTestBase.php
Normal file
|
|
@ -0,0 +1,72 @@
|
|||
<?php
|
||||
|
||||
namespace Drupal\Tests\tour\Functional;
|
||||
|
||||
use Drupal\Tests\BrowserTestBase;
|
||||
|
||||
/**
|
||||
* Base class for testing Tour functionality.
|
||||
*/
|
||||
abstract class TourTestBase extends BrowserTestBase {
|
||||
|
||||
/**
|
||||
* Assert function to determine if tips rendered to the page
|
||||
* have a corresponding page element.
|
||||
*
|
||||
* @param array $tips
|
||||
* A list of tips which provide either a "data-id" or "data-class".
|
||||
*
|
||||
* @code
|
||||
* // Basic example.
|
||||
* $this->assertTourTips();
|
||||
*
|
||||
* // Advanced example. The following would be used for multipage or
|
||||
* // targeting a specific subset of tips.
|
||||
* $tips = array();
|
||||
* $tips[] = array('data-id' => 'foo');
|
||||
* $tips[] = array('data-id' => 'bar');
|
||||
* $tips[] = array('data-class' => 'baz');
|
||||
* $this->assertTourTips($tips);
|
||||
* @endcode
|
||||
*/
|
||||
public function assertTourTips($tips = []) {
|
||||
// Get the rendered tips and their data-id and data-class attributes.
|
||||
if (empty($tips)) {
|
||||
// Tips are rendered as <li> elements inside <ol id="tour">.
|
||||
$rendered_tips = $this->xpath('//ol[@id = "tour"]//li[starts-with(@class, "tip")]');
|
||||
foreach ($rendered_tips as $rendered_tip) {
|
||||
$tips[] = [
|
||||
'data-id' => $rendered_tip->getAttribute('data-id'),
|
||||
'data-class' => $rendered_tip->getAttribute('data-class'),
|
||||
];
|
||||
}
|
||||
}
|
||||
|
||||
// If the tips are still empty we need to fail.
|
||||
if (empty($tips)) {
|
||||
$this->fail('Could not find tour tips on the current page.');
|
||||
}
|
||||
else {
|
||||
// Check for corresponding page elements.
|
||||
$total = 0;
|
||||
$modals = 0;
|
||||
foreach ($tips as $tip) {
|
||||
if (!empty($tip['data-id'])) {
|
||||
$elements = $this->getSession()->getPage()->findAll('css', '#' . $tip['data-id']);
|
||||
$this->assertTrue(!empty($elements) && count($elements) === 1, format_string('Found corresponding page element for tour tip with id #%data-id', ['%data-id' => $tip['data-id']]));
|
||||
}
|
||||
elseif (!empty($tip['data-class'])) {
|
||||
$elements = $this->getSession()->getPage()->findAll('css', '.' . $tip['data-class']);
|
||||
$this->assertFalse(empty($elements), format_string('Found corresponding page element for tour tip with class .%data-class', ['%data-class' => $tip['data-class']]));
|
||||
}
|
||||
else {
|
||||
// It's a modal.
|
||||
$modals++;
|
||||
}
|
||||
$total++;
|
||||
}
|
||||
$this->pass(format_string('Total %total Tips tested of which %modals modal(s).', ['%total' => $total, '%modals' => $modals]));
|
||||
}
|
||||
}
|
||||
|
||||
}
|
||||
|
|
@ -1,6 +1,6 @@
|
|||
<?php
|
||||
|
||||
namespace Drupal\tour\Tests;
|
||||
namespace Drupal\Tests\tour\Functional;
|
||||
|
||||
/**
|
||||
* Simple tour tips test base.
|
||||
|
|
@ -0,0 +1,44 @@
|
|||
<?php
|
||||
|
||||
namespace Drupal\Tests\tour\Unit\Plugin\tour\tip;
|
||||
|
||||
use Drupal\Tests\UnitTestCase;
|
||||
use Drupal\tour\Plugin\tour\tip\TipPluginText;
|
||||
|
||||
/**
|
||||
* @coversDefaultClass \Drupal\tour\Plugin\tour\tip\TipPluginText
|
||||
* @group tour
|
||||
*/
|
||||
class TipPluginTextTest extends UnitTestCase {
|
||||
|
||||
/**
|
||||
* Tests that getAriaId returns unique id per plugin instance.
|
||||
*
|
||||
* @see \Drupal\tour\Plugin\tour\tip\TipPluginText::getAriaId()
|
||||
* @runTestsInSeparateProcesses
|
||||
* This test calls \Drupal\Component\Utility\Html::getUniqueId() which uses a
|
||||
* static list. Run this test in a separate process to prevent side effects.
|
||||
*/
|
||||
public function testGetAriaId() {
|
||||
$id_instance_one = 'one';
|
||||
$id_instance_two = 'two';
|
||||
$config_instance_one = [
|
||||
'id' => $id_instance_one,
|
||||
];
|
||||
$config_instance_two = [
|
||||
'id' => $id_instance_two,
|
||||
];
|
||||
$definition = [];
|
||||
$plugin_id = 'text';
|
||||
$token = $this->createMock('\Drupal\Core\Utility\Token');
|
||||
$instance_one = new TipPluginText($config_instance_one, $plugin_id, $definition, $token);
|
||||
$instance_two = new TipPluginText($config_instance_two, $plugin_id, $definition, $token);
|
||||
$instance_three = new TipPluginText($config_instance_one, $plugin_id, $definition, $token);
|
||||
|
||||
$this->assertEquals($id_instance_one, $instance_one->getAriaId());
|
||||
$this->assertEquals($id_instance_two, $instance_two->getAriaId());
|
||||
$this->assertNotEquals($instance_one->getAriaId(), $instance_two->getAriaId());
|
||||
$this->assertNotEquals($instance_one->getAriaId(), $instance_three->getAriaId());
|
||||
}
|
||||
|
||||
}
|
||||
|
|
@ -5,4 +5,4 @@ package: Testing
|
|||
version: VERSION
|
||||
core: 8.x
|
||||
dependencies:
|
||||
- tour
|
||||
- drupal:tour
|
||||
|
|
|
|||
|
|
@ -28,4 +28,3 @@ tour_test.3:
|
|||
_controller: '\Drupal\tour_test\Controller\TourTestController::tourTest1'
|
||||
requirements:
|
||||
_access: 'TRUE'
|
||||
|
||||
|
|
|
|||
|
|
@ -54,6 +54,7 @@ function tour_toolbar() {
|
|||
'#attributes' => [
|
||||
'class' => ['toolbar-icon', 'toolbar-icon-help'],
|
||||
'aria-pressed' => 'false',
|
||||
'type' => 'button',
|
||||
],
|
||||
],
|
||||
'#wrapper_attributes' => [
|
||||
|
|
|
|||
Reference in a new issue