tweak icon-library generation

test/javascripts/acceptance/composer-test.js.es6

@@ -264,7 +264,7 @@ QUnit.test("Composer can toggle between reply and createTopic", assert => {
 
   click('.topic-post:eq(0) button.reply');
   click('button.options');
-  click('.popup-menu .d-eye-slash');
+  click('.popup-menu .d-icon-eye-slash');
   andThen(() => {
     assert.ok(
       find('.composer-fields .whisper').text().indexOf(I18n.t("composer.whisper")) > 0,
@@ -286,7 +286,7 @@ QUnit.test("Composer can toggle between reply and createTopic", assert => {
   });
 
   click('button.options');
-  click('.popup-menu .d-eye-slash');
+  click('.popup-menu .d-icon-eye-slash');
   andThen(() => {
     assert.ok(
       find('.composer-fields .whisper').text().indexOf(I18n.t("composer.unlist")) > 0,

test/javascripts/acceptance/topic-test.js.es6

@@ -33,7 +33,7 @@ QUnit.test("Share Popup", assert => {
 QUnit.test("Showing and hiding the edit controls", assert => {
   visit("/t/internationalization-localization/280");
 
-  click('#topic-title .d-pencil');
+  click('#topic-title .d-icon-pencil');
 
   andThen(() => {
     assert.ok(exists('#edit-title'), 'it shows the editing controls');
@@ -50,7 +50,7 @@ QUnit.test("Showing and hiding the edit controls", assert => {
 QUnit.test("Updating the topic title and category", assert => {
   visit("/t/internationalization-localization/280");
 
-  click('#topic-title .d-pencil');
+  click('#topic-title .d-icon-pencil');
 
   fillIn('#edit-title', 'this is the new title');
 
@@ -165,7 +165,7 @@ QUnit.test("Visit topic routes", assert => {
 
 QUnit.test("Updating the topic title with emojis", assert => {
   visit("/t/internationalization-localization/280");
-  click('#topic-title .d-pencil');
+  click('#topic-title .d-icon-pencil');
 
   fillIn('#edit-title', 'emojis title :bike: :blonde_woman:t6:');
 

test/javascripts/components/categories-admin-dropdown-test.js.es6

@@ -7,8 +7,8 @@ componentTest('default', {
   test(assert) {
     const $selectKit = selectKit('.categories-admin-dropdown');
 
-    assert.equal($selectKit.el.find(".d-bars").length, 1);
-    assert.equal($selectKit.el.find(".d-caret-down").length, 1);
+    assert.equal($selectKit.el.find(".d-icon-bars").length, 1);
+    assert.equal($selectKit.el.find(".d-icon-caret-down").length, 1);
 
     expandSelectKit();
 

test/javascripts/components/d-button-test.js.es6

@@ -6,7 +6,7 @@ componentTest('icon only button', {
 
   test(assert) {
     assert.ok(this.$('button.btn.btn-icon.no-text').length, 'it has all the classes');
-    assert.ok(this.$('button .d-icon.d-plus').length, 'it has the icon');
+    assert.ok(this.$('button .d-icon.d-icon-plus').length, 'it has the icon');
     assert.equal(this.$('button').attr('tabindex'), "3", 'it has the tabindex');
   }
 });
@@ -16,7 +16,7 @@ componentTest('icon and text button', {
 
   test(assert) {
     assert.ok(this.$('button.btn.btn-icon-text').length, 'it has all the classes');
-    assert.ok(this.$('button .d-icon.d-plus').length, 'it has the icon');
+    assert.ok(this.$('button .d-icon.d-icon-plus').length, 'it has the icon');
     assert.ok(this.$('button span.d-button-label').length, 'it has the label');
   }
 });

test/javascripts/components/d-icon-test.js.es6

@@ -0,0 +1,21 @@
+import componentTest from 'helpers/component-test';
+
+moduleForComponent('d-icon', {integration: true});
+
+componentTest('default', {
+  template: '{{d-icon "bars"}}',
+
+  test(assert) {
+    const html = this.$().html().trim();
+    assert.equal(html, '<i class="fa fa-bars d-icon d-icon-bars"></i>');
+  }
+});
+
+componentTest('with replacement', {
+  template: '{{d-icon "d-watching"}}',
+
+  test(assert) {
+    const html = this.$().html().trim();
+    assert.equal(html, '<i class="fa fa-exclamation-circle d-icon d-icon-d-watching"></i>');
+  }
+});

test/javascripts/widgets/actions-summary-test.js.es6

@@ -74,7 +74,7 @@ widgetTest('post deleted', {
     });
   },
   test(assert) {
-    assert.ok(this.$('.post-action .d-trash-o').length === 1, 'it has the deleted icon');
+    assert.ok(this.$('.post-action .d-icon-trash-o').length === 1, 'it has the deleted icon');
     assert.ok(this.$('.avatar[title=eviltrout]').length === 1, 'it has the deleted by avatar');
   }
 });

test/javascripts/widgets/button-test.js.es6

@@ -11,7 +11,7 @@ widgetTest('icon only button', {
 
   test(assert) {
     assert.ok(this.$('button.btn.btn-icon.no-text').length, 'it has all the classes');
-    assert.ok(this.$('button .d-icon.d-smile-o').length, 'it has the icon');
+    assert.ok(this.$('button .d-icon.d-icon-smile-o').length, 'it has the icon');
   }
 });
 
@@ -24,7 +24,7 @@ widgetTest('icon and text button', {
 
   test(assert) {
     assert.ok(this.$('button.btn.btn-icon-text').length, 'it has all the classes');
-    assert.ok(this.$('button .d-icon.d-plus').length, 'it has the icon');
+    assert.ok(this.$('button .d-icon.d-icon-plus').length, 'it has the icon');
     assert.ok(this.$('button span.d-button-label').length, 'it has the label');
   }
 });

test/javascripts/widgets/home-logo-test.js.es6

@@ -66,7 +66,7 @@ widgetTest('no logo - minimized', {
   },
 
   test(assert) {
-    assert.ok(this.$('.d-home').length === 1);
+    assert.ok(this.$('.d-icon-home').length === 1);
   }
 });
 

test/javascripts/widgets/post-test.js.es6

@@ -436,7 +436,7 @@ widgetTest("reply directly above", {
     click('a.reply-to-tab');
     andThen(() => {
       assert.equal(this.$('section.embedded-posts.top .cooked').length, 1);
-      assert.equal(this.$('section.embedded-posts .d-arrow-up').length, 1);
+      assert.equal(this.$('section.embedded-posts .d-icon-arrow-up').length, 1);
     });
   }
 });
@@ -673,7 +673,7 @@ widgetTest("replies - one below, not suppressed", {
     click('button.show-replies');
     andThen(() => {
       assert.equal(this.$('section.embedded-posts.bottom .cooked').length, 1);
-      assert.equal(this.$('section.embedded-posts .d-arrow-down').length, 1);
+      assert.equal(this.$('section.embedded-posts .d-icon-arrow-down').length, 1);
     });
   }
 });
@@ -760,7 +760,7 @@ widgetTest("topic map - links", {
     click('nav.buttons button');
     andThen(() => {
       assert.equal(this.$('.map.map-collapsed').length, 0);
-      assert.equal(this.$('.topic-map .d-chevron-up').length, 1);
+      assert.equal(this.$('.topic-map .d-icon-chevron-up').length, 1);
       assert.equal(this.$('.topic-map-expanded').length, 1);
       assert.equal(this.$('.topic-map-expanded .topic-link').length, 5, 'it limits the links displayed');
     });

test/javascripts/widgets/poster-name-test.js.es6

@@ -38,7 +38,7 @@ widgetTest('extra classes and glyphs', {
     assert.ok(this.$('span.staff').length);
     assert.ok(this.$('span.admin').length);
     assert.ok(this.$('span.moderator').length);
-    assert.ok(this.$('.d-shield').length);
+    assert.ok(this.$('.d-icon-shield').length);
     assert.ok(this.$('span.new-user').length);
     assert.ok(this.$('span.fish').length);
   }