diff --git a/cypress/integration/edit/edit_dashboard.feature b/cypress/integration/edit/edit_dashboard.feature
index 131a2d768..a1dc88b5b 100644
--- a/cypress/integration/edit/edit_dashboard.feature
+++ b/cypress/integration/edit/edit_dashboard.feature
@@ -45,14 +45,14 @@ Feature: Creating, editing and deleting dashboard
         And I confirm I want to discard changes
         Then the dashboard displays in view mode
 
-    # @mutating
-    # Scenario: I star the dashboard
-    #     Given I open existing dashboard
-    #     And the dashboard is not starred
-    #     When I click to star the dashboard
-    #     Then the dashboard is starred
-    #     When I click to unstar the dashboard
-    #     Then the dashboard is not starred
+    @mutating
+    Scenario: I star the dashboard
+        Given I open existing dashboard
+        And the dashboard is not starred
+        When I click to star the dashboard
+        Then the dashboard is starred
+        When I click to unstar the dashboard
+        Then the dashboard is not starred
 
 
     @mutating
diff --git a/cypress/integration/view/offline.feature b/cypress/integration/view/offline.feature
new file mode 100644
index 000000000..813afb406
--- /dev/null
+++ b/cypress/integration/view/offline.feature
@@ -0,0 +1,69 @@
+Feature: Offline dashboard
+
+    Scenario: I cache an uncached dashboard
+        Given I create a cached and uncached dashboard
+        Then the cached dashboard has a Last Updated time and chip icon
+        And the uncached dashboard does not have a Last Updated time and no chip icon
+
+    Scenario: I am online with an uncached dashboard when I lose connectivity
+        Given I open an uncached dashboard
+        When connectivity is turned off
+        Then all actions for "uncached" dashboard requiring connectivity are disabled
+
+    Scenario: I am online with a cached dashboard when I lose connectivity
+        Given I open a cached dashboard
+        Then the cached dashboard options are available
+        When connectivity is turned off
+        Then all actions for "cached" dashboard requiring connectivity are disabled
+
+    Scenario: I am offline and switch from a cached dashboard to an uncached dashboard
+        Given I open a cached dashboard
+        And connectivity is turned off
+        When I click to open an uncached dashboard when offline
+        Then the dashboard is not available and offline message is displayed
+
+    Scenario: I am offline and switch to a cached dashboard
+        Given I open an uncached dashboard
+        And connectivity is turned off
+        When I click to open a cached dashboard when offline
+        Then the cached dashboard is loaded and displayed in view mode
+
+    Scenario: I am offline and switch to an uncached dashboard and then connectivity is restored
+        Given I open a cached dashboard
+        And connectivity is turned off
+        When I click to open an uncached dashboard when offline
+        Then the dashboard is not available and offline message is displayed
+        When connectivity is turned on
+        Then the uncached dashboard is loaded and displayed in view mode
+
+    Scenario: I am in edit mode on an uncached dashboard when I lose connectivity and then I exit without saving and then connectivity is restored
+        Given I open an uncached dashboard in edit mode
+        When connectivity is turned off
+        Then all edit actions requiring connectivity are disabled
+        When I click Exit without saving
+        Then the dashboard is not available and offline message is displayed
+        When connectivity is turned on
+        Then the uncached dashboard is loaded and displayed in view mode
+
+    Scenario: I am in edit mode on a cached dashboard when I lose connectivity and then I exit without saving
+        Given I open a cached dashboard in edit mode
+        When connectivity is turned off
+        Then all edit actions requiring connectivity are disabled
+        When I click Exit without saving
+        Then the cached dashboard is loaded and displayed in view mode
+
+    Scenario: The sharing dialog is open when connectivity is lost
+        Given I open a cached dashboard
+        When I open sharing settings
+        And connectivity is turned off
+        Then it is not possible to change sharing settings
+
+    # Scenario: The interpretations panel is open when connectivity is lost
+    #     Given I open a cached dashboard
+    #     And I open the interpretations panel
+    #     When connectivity is turned off
+    #     Then it is not possible to interact with interpretations
+
+
+    Scenario: I delete the cached and uncached dashboard
+        Given I delete the cached and uncached dashboard
\ No newline at end of file