Changeset 3002:c90142fc9280 for features

Timestamp:

04/27/15 14:33:53 (10 years ago)

Author:

Nicolas <nikrou77@…>

Branch:

default

Message:

Addresses #1647 - Missing clause for update. So update did not work when there were severals existings words.

Location:

features

Files:

• plugins/antispam.feature (modified) (3 diffs)
• sql/db_cleanup.sql (modified) (1 diff)
• sql/db_init.sql (modified) (1 diff)

features/plugins/antispam.feature

@@ -30 +30 @@
     When I fill in "Add a word" with "MyWord"
     And I press "Add"
-    Then I should see "MyWord" in the ".antispam" element
+    Then I should see "MyWord" in the ".antispam .local" element
     # try to add to other blog
     When I switch to blog "My first blog"
@@ -47 +47 @@
     When I fill in "Add a word" with "MyWord"
     And I press "Add"
-    Then I should see "MyWord" in the ".antispam" element
+    Then I should see "MyWord" in the ".antispam .local" element
+    When I fill in "Add a word" with "Other word"
+    And I check "Global word (used for all blogs)"
+    And I press "Add"
+    Then I should see "Other word" in the ".antispam .global" element
     # try to add to other blog
     When I switch to blog "My first blog"
@@ -55 +59 @@
     And I press "Add"
     Then I should not see "This word exists"
-    And I should see "MyWord" in the ".antispam" element
+    And I should see "MyWord" in the ".antispam .global" element

features/sql/db_cleanup.sql

@@ -2 +2 @@
 DELETE FROM dc_spamrule;
 DELETE FROM dc_blog WHERE blog_id!='default';
+DELETE FROM dc_session;

features/sql/db_init.sql

@@ -2 +2 @@
 UPDATE dc_blog SET blog_name = 'My first blog' WHERE blog_id = 'default';
 UPDATE dc_setting SET setting_value = 'en',blog_id = 'default' WHERE setting_ns = 'system' AND setting_id = 'lang' AND blog_id = 'default';
+DELETE FROM dc_spamrule;